Commit 4c0b3d24 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo

Fix unused import warnings

parent 7115fe47
...@@ -49,7 +49,7 @@ data-files: ...@@ -49,7 +49,7 @@ data-files:
library library
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wincomplete-patterns -Wmissing-signatures -Wunused-do-bind -Wunused-local-binds -Wunused-top-binds -Wunused-matches ghc-options: -Wincomplete-patterns -Wmissing-signatures -Wunused-do-bind -Wunused-local-binds -Wunused-top-binds -Wunused-matches -Wunused-imports
build-depends: build-depends:
aeson >=1.0, aeson >=1.0,
base >=4.9, base >=4.9,
...@@ -125,7 +125,7 @@ executable ihaskell ...@@ -125,7 +125,7 @@ executable ihaskell
-- Other library packages from which modules are imported. -- Other library packages from which modules are imported.
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wincomplete-patterns -Wmissing-signatures -Wunused-do-bind -Wunused-local-binds -Wunused-top-binds -Wunused-matches ghc-options: -Wincomplete-patterns -Wmissing-signatures -Wunused-do-bind -Wunused-local-binds -Wunused-top-binds -Wunused-matches -Wunused-imports
build-depends: build-depends:
ihaskell -any, ihaskell -any,
base >=4.9 && < 4.13, base >=4.9 && < 4.13,
...@@ -152,7 +152,7 @@ Test-Suite hspec ...@@ -152,7 +152,7 @@ Test-Suite hspec
IHaskell.Test.Util IHaskell.Test.Util
IHaskell.Test.Parser IHaskell.Test.Parser
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wincomplete-patterns -Wmissing-signatures -Wunused-do-bind -Wunused-local-binds -Wunused-top-binds -Wunused-matches ghc-options: -Wincomplete-patterns -Wmissing-signatures -Wunused-do-bind -Wunused-local-binds -Wunused-top-binds -Wunused-matches -Wunused-imports
build-depends: build-depends:
base, base,
ihaskell, ihaskell,
......
...@@ -7,17 +7,12 @@ module Main (main) where ...@@ -7,17 +7,12 @@ module Main (main) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
-- Standard library imports. -- Standard library imports.
import Control.Concurrent (threadDelay)
import Control.Concurrent.Chan import Control.Concurrent.Chan
import Control.Arrow (second) import Control.Arrow (second)
import Data.Aeson import Data.Aeson
import System.Directory
import System.Process (readProcess, readProcessWithExitCode) import System.Process (readProcess, readProcessWithExitCode)
import System.Exit (exitSuccess, ExitCode(ExitSuccess)) import System.Exit (exitSuccess, ExitCode(ExitSuccess))
import Control.Exception (try, SomeException) import Control.Exception (try, SomeException)
...@@ -25,7 +20,6 @@ import System.Environment (getArgs) ...@@ -25,7 +20,6 @@ import System.Environment (getArgs)
import System.Environment (setEnv) import System.Environment (setEnv)
import System.Posix.Signals import System.Posix.Signals
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Text.Encoding as E
import Data.List (break, last) import Data.List (break, last)
import Data.Version (showVersion) import Data.Version (showVersion)
...@@ -35,7 +29,6 @@ import IHaskell.Eval.Completion (complete) ...@@ -35,7 +29,6 @@ import IHaskell.Eval.Completion (complete)
import IHaskell.Eval.Inspect (inspect) import IHaskell.Eval.Inspect (inspect)
import IHaskell.Eval.Evaluate import IHaskell.Eval.Evaluate
import IHaskell.Display import IHaskell.Display
import IHaskell.Eval.Info
import IHaskell.Eval.Widgets (widgetHandler) import IHaskell.Eval.Widgets (widgetHandler)
import IHaskell.Flags import IHaskell.Flags
import IHaskell.IPython import IHaskell.IPython
...@@ -49,13 +42,6 @@ import qualified IHaskell.IPython.Stdin as Stdin ...@@ -49,13 +42,6 @@ import qualified IHaskell.IPython.Stdin as Stdin
-- Cabal imports. -- Cabal imports.
import Paths_ihaskell(version) import Paths_ihaskell(version)
-- GHC API imports.
#if MIN_VERSION_ghc(8,4,0)
import GHC hiding (extensions, language, convert)
#else
import GHC hiding (extensions, language)
#endif
main :: IO () main :: IO ()
main = do main = do
args <- parseFlags <$> getArgs args <- parseFlags <$> getArgs
......
...@@ -4,14 +4,9 @@ module IHaskell.BrokenPackages (getBrokenPackages) where ...@@ -4,14 +4,9 @@ module IHaskell.BrokenPackages (getBrokenPackages) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Text.Parsec import Text.Parsec
import Text.Parsec.String import Text.Parsec.String
import Control.Applicative hiding ((<|>), many)
import Shelly import Shelly
......
{-# LANGUAGE NoImplicitPrelude #-}
module IHaskell.CSS (ihaskellCSS) where module IHaskell.CSS (ihaskellCSS) where
import IHaskellPrelude import IHaskellPrelude
...@@ -5,7 +6,7 @@ import IHaskellPrelude ...@@ -5,7 +6,7 @@ import IHaskellPrelude
ihaskellCSS :: String ihaskellCSS :: String
ihaskellCSS = ihaskellCSS =
unlines unlines
[ [
-- Custom IHaskell CSS -- Custom IHaskell CSS
"/* Styles used for the Hoogle display in the pager */" "/* Styles used for the Hoogle display in the pager */"
, ".hoogle-doc {" , ".hoogle-doc {"
...@@ -42,7 +43,7 @@ ihaskellCSS = ...@@ -42,7 +43,7 @@ ihaskellCSS =
, ".hoogle-class {" , ".hoogle-class {"
, "font-weight: bold;" , "font-weight: bold;"
, "}" , "}"
, ,
-- Styles used for basic displays -- Styles used for basic displays
".get-type {" ".get-type {"
, "color: green;" , "color: green;"
...@@ -75,13 +76,13 @@ ihaskellCSS = ...@@ -75,13 +76,13 @@ ihaskellCSS =
, ".err-msg.in.collapse {" , ".err-msg.in.collapse {"
, "padding-top: 0.7em;" , "padding-top: 0.7em;"
, "}" , "}"
, ,
-- Code that will get highlighted before it is highlighted -- Code that will get highlighted before it is highlighted
".highlight-code {" ".highlight-code {"
, "white-space: pre;" , "white-space: pre;"
, "font-family: monospace;" , "font-family: monospace;"
, "}" , "}"
, ,
-- Hlint styles -- Hlint styles
".suggestion-warning { " ".suggestion-warning { "
, "font-weight: bold;" , "font-weight: bold;"
......
{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE NoImplicitPrelude #-}
-- | Description : mostly reversible conversion between ipynb and lhs -- | Description : mostly reversible conversion between ipynb and lhs
module IHaskell.Convert (convert) where module IHaskell.Convert (convert) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Control.Monad.Identity (Identity(Identity), unless, when) import Control.Monad.Identity (Identity(Identity), unless, when)
import IHaskell.Convert.Args (ConvertSpec(..), fromJustConvertSpec, toConvertSpec) import IHaskell.Convert.Args (ConvertSpec(..), fromJustConvertSpec, toConvertSpec)
......
...@@ -4,18 +4,13 @@ ...@@ -4,18 +4,13 @@
module IHaskell.Convert.Args (ConvertSpec(..), fromJustConvertSpec, toConvertSpec) where module IHaskell.Convert.Args (ConvertSpec(..), fromJustConvertSpec, toConvertSpec) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Control.Monad.Identity (Identity(Identity)) import Control.Monad.Identity (Identity(Identity))
import Data.Char (toLower) import Data.Char (toLower)
import Data.List (partition) import Data.List (partition)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import qualified Data.Text.Lazy as T (pack, Text)
import IHaskell.Flags (Argument(..), LhsStyle, lhsStyleBird, NotebookFormat(..)) import IHaskell.Flags (Argument(..), LhsStyle, lhsStyleBird, NotebookFormat(..))
import System.FilePath ((<.>), dropExtension, takeExtension) import System.FilePath ((<.>), dropExtension, takeExtension)
import Text.Printf (printf) import Text.Printf (printf)
......
...@@ -4,11 +4,8 @@ ...@@ -4,11 +4,8 @@
module IHaskell.Convert.IpynbToLhs (ipynbToLhs) where module IHaskell.Convert.IpynbToLhs (ipynbToLhs) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Data.Aeson (decode, Object, Value(Array, Object, String)) import Data.Aeson (decode, Object, Value(Array, Object, String))
import Data.Vector (Vector) import Data.Vector (Vector)
......
...@@ -6,13 +6,11 @@ module IHaskell.Convert.LhsToIpynb (lhsToIpynb) where ...@@ -6,13 +6,11 @@ module IHaskell.Convert.LhsToIpynb (lhsToIpynb) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Data.Aeson ((.=), encode, object, Value(Array, Bool, Number, String, Null)) import Data.Aeson ((.=), encode, object, Value(Array, Bool, Number, String, Null))
import Data.Char (isSpace) import Data.Char (isSpace)
import qualified Data.Vector as V (fromList, singleton) import qualified Data.Vector as V
import qualified Data.List as List import qualified Data.List as List
import IHaskell.Flags (LhsStyle(LhsStyle)) import IHaskell.Flags (LhsStyle(LhsStyle))
......
...@@ -57,14 +57,10 @@ module IHaskell.Display ( ...@@ -57,14 +57,10 @@ module IHaskell.Display (
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS import qualified Data.ByteString.Char8 as CBS
import Data.Serialize as Serialize import Data.Serialize as Serialize
import qualified Data.ByteString.Base64 as Base64 import qualified Data.ByteString.Base64 as Base64
import Data.Aeson (Value)
import System.Directory (getTemporaryDirectory, setCurrentDirectory) import System.Directory (getTemporaryDirectory, setCurrentDirectory)
import Control.Concurrent.STM (atomically) import Control.Concurrent.STM (atomically)
......
{-# LANGUAGE CPP, DoAndIfThenElse, TypeFamilies, FlexibleContexts #-} {-# LANGUAGE CPP, NoImplicitPrelude, DoAndIfThenElse, TypeFamilies, FlexibleContexts #-}
{- | {- |
Description: Generates tab completion options. Description: Generates tab completion options.
...@@ -13,19 +13,12 @@ This has a limited amount of context sensitivity. It distinguishes between four ...@@ -13,19 +13,12 @@ This has a limited amount of context sensitivity. It distinguishes between four
module IHaskell.Eval.Completion (complete, completionTarget, completionType, CompletionType(..)) where module IHaskell.Eval.Completion (complete, completionTarget, completionType, CompletionType(..)) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Data.ByteString.UTF8 hiding (drop, take, lines, length)
import Data.Char import Data.Char
import Data.List (nub, init, last, head, elemIndex, concatMap) import Data.List (nub, init, last, elemIndex, concatMap)
import qualified Data.List.Split as Split import qualified Data.List.Split as Split
import qualified Data.List.Split.Internals as Split import qualified Data.List.Split.Internals as Split
import Data.Maybe (fromJust)
import System.Environment (getEnv) import System.Environment (getEnv)
import GHC hiding (Qualified) import GHC hiding (Qualified)
...@@ -36,14 +29,9 @@ import GHC.PackageDb (ExposedModule(exposedName)) ...@@ -36,14 +29,9 @@ import GHC.PackageDb (ExposedModule(exposedName))
#endif #endif
import DynFlags import DynFlags
import GhcMonad import GhcMonad
import qualified GhcMonad
import PackageConfig
import Outputable (showPpr) import Outputable (showPpr)
import MonadUtils (MonadIO)
import System.Directory import System.Directory
import System.FilePath
import Control.Exception (try) import Control.Exception (try)
import System.Console.Haskeline.Completion import System.Console.Haskeline.Completion
......
{-# LANGUAGE NoOverloadedStrings, TypeSynonymInstances, GADTs, CPP #-} {-# LANGUAGE NoOverloadedStrings, NoImplicitPrelude, TypeSynonymInstances, GADTs, CPP #-}
{- | Description : Wrapper around GHC API, exposing a single `evaluate` interface that runs {- | Description : Wrapper around GHC API, exposing a single `evaluate` interface that runs
a statement, declaration, import, or directive. a statement, declaration, import, or directive.
...@@ -19,59 +19,37 @@ module IHaskell.Eval.Evaluate ( ...@@ -19,59 +19,37 @@ module IHaskell.Eval.Evaluate (
) where ) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Control.Concurrent (forkIO, threadDelay) import Control.Concurrent (forkIO, threadDelay)
import Data.Foldable (foldMap) import Data.Foldable (foldMap)
import Prelude (putChar, head, tail, last, init, (!!)) import Prelude (head, tail, last, init)
import Data.List (findIndex, and, foldl1, nubBy) import Data.List (nubBy)
import Text.Printf
import Data.Char as Char import Data.Char as Char
import Data.Dynamic import Data.Dynamic
import Data.Typeable
import qualified Data.Serialize as Serialize import qualified Data.Serialize as Serialize
import System.Directory import System.Directory
#if !MIN_VERSION_base(4,8,0) #if !MIN_VERSION_base(4,8,0)
import System.Posix.IO (createPipe) import System.Posix.IO (createPipe)
#endif #endif
import System.Posix.IO (fdToHandle) import System.Posix.IO (fdToHandle)
import System.IO (hGetChar, hSetEncoding, utf8, hFlush) import System.IO (hGetChar, hSetEncoding, utf8)
import System.Random (getStdGen, randomRs) import System.Random (getStdGen, randomRs)
import Unsafe.Coerce
import Control.Monad (guard)
import System.Process import System.Process
import System.Exit import System.Exit
import Data.Maybe (fromJust) import Data.Maybe (fromJust)
import qualified Control.Monad.IO.Class as MonadIO (MonadIO, liftIO)
import qualified MonadUtils (MonadIO, liftIO)
import System.Environment (getEnv) import System.Environment (getEnv)
import qualified Data.Map as Map
import qualified GHC.Paths import qualified GHC.Paths
import NameSet
import Name
import PprTyThing
import InteractiveEval import InteractiveEval
import DynFlags import DynFlags
import Type
import Exception (gtry) import Exception (gtry)
import HscTypes import HscTypes
import HscMain import HscMain
import qualified Linker import GhcMonad (liftIO)
import TcType
import Unify
import InstEnv
import GhcMonad (liftIO, withSession)
import GHC hiding (Stmt, TypeSig) import GHC hiding (Stmt, TypeSig)
import Exception hiding (evaluate) import Exception hiding (evaluate)
import Outputable hiding ((<>)) import Outputable hiding ((<>))
import Packages import Packages
import Module hiding (Module)
import qualified Pretty
import FastString import FastString
import Bag import Bag
import qualified ErrUtils import qualified ErrUtils
...@@ -83,14 +61,9 @@ import IHaskell.Eval.Lint ...@@ -83,14 +61,9 @@ import IHaskell.Eval.Lint
import IHaskell.Display import IHaskell.Display
import qualified IHaskell.Eval.Hoogle as Hoogle import qualified IHaskell.Eval.Hoogle as Hoogle
import IHaskell.Eval.Util import IHaskell.Eval.Util
import IHaskell.Eval.Widgets
import IHaskell.BrokenPackages import IHaskell.BrokenPackages
import qualified IHaskell.IPython.Message.UUID as UUID
import StringUtils (replace, split, strip, rstrip) import StringUtils (replace, split, strip, rstrip)
import Paths_ihaskell (version)
import Data.Version (versionBranch)
data ErrorOccurred = Success data ErrorOccurred = Success
| Failure | Failure
deriving (Show, Eq) deriving (Show, Eq)
......
...@@ -9,9 +9,6 @@ module IHaskell.Eval.Hoogle ( ...@@ -9,9 +9,6 @@ module IHaskell.Eval.Hoogle (
) where ) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS import qualified Data.ByteString.Char8 as CBS
...@@ -21,8 +18,6 @@ import Data.Aeson ...@@ -21,8 +18,6 @@ import Data.Aeson
import qualified Data.List as List import qualified Data.List as List
import Data.Char (isAscii, isAlphaNum) import Data.Char (isAscii, isAlphaNum)
import IHaskell.IPython
import StringUtils (split, strip, replace) import StringUtils (split, strip, replace)
-- | Types of formats to render output to. -- | Types of formats to render output to.
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
module IHaskell.Eval.Info (info) where module IHaskell.Eval.Info (info) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import IHaskell.Eval.Evaluate (typeCleaner, Interpreter) import IHaskell.Eval.Evaluate (typeCleaner, Interpreter)
......
...@@ -7,11 +7,6 @@ Description: Generates inspections when asked for by the frontend. ...@@ -7,11 +7,6 @@ Description: Generates inspections when asked for by the frontend.
module IHaskell.Eval.Inspect (inspect) where module IHaskell.Eval.Inspect (inspect) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import qualified Prelude as P import qualified Prelude as P
...@@ -22,7 +17,6 @@ import Exception (ghandle) ...@@ -22,7 +17,6 @@ import Exception (ghandle)
import IHaskell.Eval.Evaluate (Interpreter) import IHaskell.Eval.Evaluate (Interpreter)
import IHaskell.Display import IHaskell.Display
import IHaskell.Eval.Util (getType) import IHaskell.Eval.Util (getType)
import IHaskell.Types
-- | Characters used in Haskell operators. -- | Characters used in Haskell operators.
operatorChars :: String operatorChars :: String
......
...@@ -3,33 +3,21 @@ ...@@ -3,33 +3,21 @@
module IHaskell.Eval.Lint (lint) where module IHaskell.Eval.Lint (lint) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT import Prelude (last)
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Prelude (head, tail, last)
import Control.Monad
import Data.List (findIndex)
import Data.Char
import Data.Monoid
import Data.Maybe (mapMaybe) import Data.Maybe (mapMaybe)
import System.IO.Unsafe (unsafePerformIO) import System.IO.Unsafe (unsafePerformIO)
import Language.Haskell.Exts.Syntax hiding (Module) import Language.Haskell.Exts.Syntax hiding (Module)
import qualified Language.Haskell.Exts.Syntax as SrcExts import qualified Language.Haskell.Exts.Syntax as SrcExts
import Language.Haskell.Exts (parseFileContentsWithMode) import Language.Haskell.Exts (parseFileContentsWithMode)
import Language.Haskell.Exts.Build (doE)
import Language.Haskell.Exts hiding (Module) import Language.Haskell.Exts hiding (Module)
import Language.Haskell.Exts.SrcLoc
import Language.Haskell.HLint as HLint import Language.Haskell.HLint as HLint
import Language.Haskell.HLint3 import Language.Haskell.HLint3
import IHaskell.Types import IHaskell.Types
import IHaskell.Display import IHaskell.Display
import IHaskell.IPython
import IHaskell.Eval.Parser hiding (line) import IHaskell.Eval.Parser hiding (line)
import StringUtils (replace) import StringUtils (replace)
......
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
module IHaskell.Eval.ParseShell (parseShell) where module IHaskell.Eval.ParseShell (parseShell) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Text.ParserCombinators.Parsec import Text.ParserCombinators.Parsec
......
...@@ -16,11 +16,6 @@ module IHaskell.Eval.Parser ( ...@@ -16,11 +16,6 @@ module IHaskell.Eval.Parser (
) where ) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Data.Char (toLower) import Data.Char (toLower)
import Data.List (maximumBy, inits) import Data.List (maximumBy, inits)
......
...@@ -27,10 +27,6 @@ module IHaskell.Eval.Util ( ...@@ -27,10 +27,6 @@ module IHaskell.Eval.Util (
) where ) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS import qualified Data.ByteString.Char8 as CBS
-- GHC imports. -- GHC imports.
...@@ -38,18 +34,12 @@ import DynFlags ...@@ -38,18 +34,12 @@ import DynFlags
import FastString import FastString
import GHC import GHC
import GhcMonad import GhcMonad
import HsImpExp
import HscTypes import HscTypes
import InteractiveEval
import Module
import Packages
import RdrName
import NameSet import NameSet
import Name import Name
import PprTyThing import PprTyThing
import InstEnv (ClsInst(..)) import InstEnv (ClsInst(..))
import Unify (tcMatchTys) import Unify (tcMatchTys)
import VarSet (mkVarSet)
import qualified Pretty import qualified Pretty
import qualified Outputable as O import qualified Outputable as O
......
...@@ -14,7 +14,6 @@ module IHaskell.Eval.Widgets ( ...@@ -14,7 +14,6 @@ module IHaskell.Eval.Widgets (
import IHaskellPrelude import IHaskellPrelude
import Control.Concurrent.Chan (writeChan)
import Control.Concurrent.STM (atomically) import Control.Concurrent.STM (atomically)
import Control.Concurrent.STM.TChan import Control.Concurrent.STM.TChan
import Control.Monad (foldM) import Control.Monad (foldM)
...@@ -25,8 +24,6 @@ import System.IO.Unsafe (unsafePerformIO) ...@@ -25,8 +24,6 @@ import System.IO.Unsafe (unsafePerformIO)
import IHaskell.Display import IHaskell.Display
import IHaskell.Eval.Util (unfoldM) import IHaskell.Eval.Util (unfoldM)
import IHaskell.IPython.Types (showMessageType) import IHaskell.IPython.Types (showMessageType)
import IHaskell.IPython.Message.UUID
import IHaskell.IPython.Message.Writer
import IHaskell.Types import IHaskell.Types
-- All comm_open messages go here -- All comm_open messages go here
......
...@@ -14,15 +14,10 @@ module IHaskell.Flags ( ...@@ -14,15 +14,10 @@ module IHaskell.Flags (
import IHaskellPrelude hiding (Arg(..)) import IHaskellPrelude hiding (Arg(..))
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import System.Console.CmdArgs.Explicit import System.Console.CmdArgs.Explicit
import System.Console.CmdArgs.Text import System.Console.CmdArgs.Text
import Data.List (findIndex) import Data.List (findIndex)
import IHaskell.Types
-- Command line arguments to IHaskell. A set of arguments is annotated with the mode being invoked. -- Command line arguments to IHaskell. A set of arguments is annotated with the mode being invoked.
data Args = Args IHaskellMode [Argument] data Args = Args IHaskellMode [Argument]
......
...@@ -16,11 +16,7 @@ module IHaskell.IPython ( ...@@ -16,11 +16,7 @@ module IHaskell.IPython (
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Control.Concurrent (threadDelay)
import System.Argv0 import System.Argv0
import qualified Shelly as SH import qualified Shelly as SH
import qualified System.IO as IO import qualified System.IO as IO
...@@ -32,12 +28,10 @@ import Data.Aeson.Text (encodeToTextBuilder) ...@@ -32,12 +28,10 @@ import Data.Aeson.Text (encodeToTextBuilder)
import Data.Text.Lazy.Builder (toLazyText) import Data.Text.Lazy.Builder (toLazyText)
import Control.Monad (mplus) import Control.Monad (mplus)
import qualified System.IO.Strict as StrictIO
import qualified Paths_ihaskell as Paths import qualified Paths_ihaskell as Paths
import qualified GHC.Paths import qualified GHC.Paths
import IHaskell.Types import IHaskell.Types
import System.Posix.Signals
import StringUtils (replace, split) import StringUtils (replace, split)
......
...@@ -26,16 +26,9 @@ ...@@ -26,16 +26,9 @@
module IHaskell.IPython.Stdin (fixStdin, recordParentHeader, recordKernelProfile) where module IHaskell.IPython.Stdin (fixStdin, recordParentHeader, recordKernelProfile) where
import IHaskellPrelude import IHaskellPrelude
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Char8 as CBS
import Control.Concurrent import Control.Concurrent
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Control.Concurrent.Chan
import Control.Monad
import GHC.IO.Handle import GHC.IO.Handle
import GHC.IO.Handle.Types import GHC.IO.Handle.Types
import System.Posix.IO import System.Posix.IO
......
...@@ -39,17 +39,8 @@ module IHaskell.Types ( ...@@ -39,17 +39,8 @@ module IHaskell.Types (
import IHaskellPrelude import IHaskellPrelude
import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as CBS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.Text as T
import qualified Data.Text.Lazy as LT
import Data.Aeson (Value, (.=), object) import Data.Aeson (Value, (.=), object)
import Data.Aeson.Types (emptyObject)
import qualified Data.ByteString.Char8 as Char
import Data.Function (on) import Data.Function (on)
import Data.Semigroup
import Data.Serialize import Data.Serialize
import GHC.Generics import GHC.Generics
......
{-# LANGUAGE NoImplicitPrelude #-}
module StringUtils ( module StringUtils (
strip, strip,
lstrip, lstrip,
......
...@@ -6,8 +6,7 @@ import Prelude ...@@ -6,8 +6,7 @@ import Prelude
import Data.String.Here (hereLit) import Data.String.Here (hereLit)
import Test.Hspec import Test.Hspec
import Test.Hspec.Contrib.HUnit import Test.HUnit (assertFailure)
import Test.HUnit (assertBool, assertFailure)
import IHaskell.Test.Util (ghc, strip) import IHaskell.Test.Util (ghc, strip)
import IHaskell.Eval.Parser (parseString, getModuleName, unloc, layoutChunks, Located(..), import IHaskell.Eval.Parser (parseString, getModuleName, unloc, layoutChunks, Located(..),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment