From 668e9e4771bd9cde268265354b3202bc03bd778b Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Fri, 20 Sep 2013 17:21:10 +0900 Subject: [PATCH] Removing GHCVersion. --- Language/Haskell/GhcMod.hs | 4 ---- Language/Haskell/GhcMod/CabalApi.hs | 16 +--------------- Language/Haskell/GhcMod/Types.hs | 3 --- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Language/Haskell/GhcMod.hs b/Language/Haskell/GhcMod.hs index a1d2b30..a0ac17e 100644 --- a/Language/Haskell/GhcMod.hs +++ b/Language/Haskell/GhcMod.hs @@ -4,9 +4,6 @@ module Language.Haskell.GhcMod ( -- * Cradle Cradle(..) , findCradle - -- * GHC version - , GHCVersion - , getGHCVersion -- * Options , Options(..) , LineSeparator(..) @@ -48,4 +45,3 @@ import Language.Haskell.GhcMod.Lang import Language.Haskell.GhcMod.Lint import Language.Haskell.GhcMod.List import Language.Haskell.GhcMod.Types -import Language.Haskell.GhcMod.CabalApi diff --git a/Language/Haskell/GhcMod/CabalApi.hs b/Language/Haskell/GhcMod/CabalApi.hs index 33c78c5..dafd25e 100644 --- a/Language/Haskell/GhcMod/CabalApi.hs +++ b/Language/Haskell/GhcMod/CabalApi.hs @@ -6,12 +6,10 @@ module Language.Haskell.GhcMod.CabalApi ( , cabalAllBuildInfo , cabalDependPackages , cabalSourceDirs - , getGHCVersion ) where import Control.Applicative ((<$>)) import Control.Exception (throwIO) -import Data.List (intercalate) import Data.Maybe (maybeToList) import Data.Set (fromList, toList) import Distribution.Package (Dependency(Dependency) @@ -26,7 +24,7 @@ import Distribution.Simple.Program.Types (programName, programFindVersion) import Distribution.System (buildPlatform) import Distribution.Text (display) import Distribution.Verbosity (silent) -import Distribution.Version (versionBranch, Version) +import Distribution.Version (Version) import Language.Haskell.GhcMod.Types import System.Directory (doesFileExist) import System.FilePath @@ -151,18 +149,6 @@ uniqueAndSort = toList . fromList ---------------------------------------------------------------- --- | Getting GHC version. 7.6.3 becames 706 in the second of the result. -getGHCVersion :: IO (GHCVersion, Int) -getGHCVersion = toTupple <$> getGHC - where - toTupple v - | length vs < 2 = (verstr, 0) - | otherwise = (verstr, ver) - where - vs = versionBranch v - ver = (vs !! 0) * 100 + (vs !! 1) - verstr = intercalate "." . map show $ vs - getGHCId :: IO CompilerId getGHCId = CompilerId GHC <$> getGHC diff --git a/Language/Haskell/GhcMod/Types.hs b/Language/Haskell/GhcMod/Types.hs index 6ac01f9..d39daa5 100644 --- a/Language/Haskell/GhcMod/Types.hs +++ b/Language/Haskell/GhcMod/Types.hs @@ -97,9 +97,6 @@ type IncludeDir = FilePath -- | A package name. type Package = String --- | GHC version in 'String'. -type GHCVersion = String - -- | Haskell expression. type Expression = String