🔥 a bunch of redundant imports.

robrix · robrix · commit b1fe3e6073aa · 2019-07-15T15:23:29.000-04:00
diff --git a/semantic-core/src/Analysis/Eval.hs b/semantic-core/src/Analysis/Eval.hs
@@ -11,7 +11,6 @@ module Analysis.Eval
 , Analysis(..)
 ) where
 
-import Control.Effect
 import Control.Effect.Fail
 import Control.Effect.Reader
 import Control.Monad ((>=>))
diff --git a/semantic-core/src/Control/Effect/Readline.hs b/semantic-core/src/Control/Effect/Readline.hs
@@ -20,7 +20,6 @@ import Prelude hiding (print)
 
 import Control.Effect.Carrier
 import Control.Effect.Reader
-import Control.Effect.Sum
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
diff --git a/semantic-core/src/Data/Core/Pretty.hs b/semantic-core/src/Data/Core/Pretty.hs
@@ -8,7 +8,6 @@ module Data.Core.Pretty
   , prettyCore
   ) where
 
-import           Control.Effect
 import           Control.Effect.Reader
 import           Data.Core
 import           Data.File
diff --git a/semantic-core/src/Data/Loc.hs b/semantic-core/src/Data/Loc.hs
@@ -15,7 +15,6 @@ import Control.Effect.Carrier
 import Control.Effect.Error
 import Control.Effect.Fail
 import Control.Effect.Reader
-import Control.Effect.Sum
 import Data.Text (Text, pack)
 import Data.Text.Prettyprint.Doc (Pretty (..))
 import GHC.Stack
diff --git a/semantic-core/src/Data/Name.hs b/semantic-core/src/Data/Name.hs
@@ -16,11 +16,9 @@ module Data.Name
 ) where
 
 import           Control.Applicative
-import           Control.Effect
 import           Control.Effect.Carrier
 import           Control.Effect.Reader
 import           Control.Effect.State
-import           Control.Effect.Sum
 import           Control.Monad.Fail
 import           Control.Monad.IO.Class
 import qualified Data.Char as Char
diff --git a/src/Analysis/Abstract/Graph.hs b/src/Analysis/Abstract/Graph.hs
@@ -19,7 +19,6 @@ module Analysis.Abstract.Graph
 import           Algebra.Graph.Export.Dot hiding (vertexName)
 import           Control.Abstract hiding (Function(..))
 import           Control.Effect.Carrier
-import           Control.Effect.Sum
 import           Data.Abstract.BaseError
 import           Data.Abstract.Declarations
 import           Data.Abstract.Module (Module (moduleInfo), ModuleInfo (..))
diff --git a/src/Control/Abstract/Context.hs b/src/Control/Abstract/Context.hs
@@ -12,7 +12,6 @@ module Control.Abstract.Context
 , withCurrentCallStack
 ) where
 
-import Control.Effect
 import Control.Effect.Reader
 import Control.Effect.State
 import Data.Abstract.Module
diff --git a/src/Control/Abstract/Evaluator.hs b/src/Control/Abstract/Evaluator.hs
@@ -17,7 +17,6 @@ module Control.Abstract.Evaluator
   , module X
   ) where
 
-import Control.Effect as X
 import Control.Effect.Carrier
 import Control.Effect.Error as X
 import Control.Effect.Fresh as X
diff --git a/src/Control/Abstract/Modules.hs b/src/Control/Abstract/Modules.hs
@@ -21,7 +21,6 @@ module Control.Abstract.Modules
 
 import Control.Abstract.Evaluator
 import Control.Effect.Carrier
-import Control.Effect.Sum
 import Data.Abstract.BaseError
 import Data.Abstract.Module
 import Data.Abstract.ModuleTable as ModuleTable
diff --git a/src/Control/Abstract/PythonPackage.hs b/src/Control/Abstract/PythonPackage.hs
@@ -4,7 +4,6 @@ module Control.Abstract.PythonPackage
 
 import           Control.Abstract as Abstract
 import           Control.Effect.Carrier
-import           Control.Effect.Sum
 import           Data.Abstract.Name (name)
 import           Data.Abstract.Path (stripQuotes)
 import           Data.Abstract.Value.Concrete (Value (..))
diff --git a/src/Control/Effect/Interpose.hs b/src/Control/Effect/Interpose.hs
@@ -10,7 +10,6 @@ module Control.Effect.Interpose
 import Control.Applicative
 import Control.Effect.Carrier
 import Control.Effect.Reader
-import Control.Effect.Sum
 
 data Interpose (eff :: (* -> *) -> * -> *) m k
   = forall a . Interpose (m a) (forall n x . eff n x -> m x) (a -> m k)
diff --git a/src/Control/Effect/REPL.hs b/src/Control/Effect/REPL.hs
@@ -10,9 +10,7 @@ module Control.Effect.REPL
 
 import Prologue
 
-import Control.Effect
 import Control.Effect.Carrier
-import Control.Effect.Sum
 import Control.Effect.Reader
 import System.Console.Haskeline
 import qualified Data.Text as T
diff --git a/src/Data/Abstract/Address/Hole.hs b/src/Data/Abstract/Address/Hole.hs
@@ -6,7 +6,6 @@ module Data.Abstract.Address.Hole
 
 import Control.Abstract
 import Control.Effect.Carrier
-import Control.Effect.Sum
 import Prologue
 
 data Hole context a = Partial context | Total a
diff --git a/src/Data/Abstract/Address/Monovariant.hs b/src/Data/Abstract/Address/Monovariant.hs
@@ -5,7 +5,6 @@ module Data.Abstract.Address.Monovariant
 
 import Control.Abstract
 import Control.Effect.Carrier
-import Control.Effect.Sum
 import Data.Abstract.Name
 import qualified Data.Set as Set
 import Prologue
diff --git a/src/Data/Abstract/Address/Precise.hs b/src/Data/Abstract/Address/Precise.hs
@@ -6,7 +6,6 @@ module Data.Abstract.Address.Precise
 import Control.Abstract
 import Control.Abstract.ScopeGraph (AllocatorC(..))
 import Control.Effect.Carrier
-import Control.Effect.Sum
 import qualified Data.Set as Set
 import Prologue
 
diff --git a/src/Data/Abstract/Name.hs b/src/Data/Abstract/Name.hs
@@ -9,7 +9,6 @@ module Data.Abstract.Name
 , __self
 ) where
 
-import           Control.Effect
 import           Control.Effect.Fresh
 import           Data.Aeson
 import qualified Data.Char as Char
diff --git a/src/Data/Abstract/Value/Abstract.hs b/src/Data/Abstract/Value/Abstract.hs
@@ -8,7 +8,6 @@ module Data.Abstract.Value.Abstract
 
 import Control.Abstract as Abstract
 import Control.Effect.Carrier
-import Control.Effect.Sum
 import Data.Abstract.BaseError
 import Data.Abstract.Evaluatable
 import qualified Data.Map.Strict as Map
diff --git a/src/Data/Abstract/Value/Concrete.hs b/src/Data/Abstract/Value/Concrete.hs
@@ -12,7 +12,6 @@ import qualified Control.Abstract as Abstract
 import Control.Abstract hiding (Boolean(..), Function(..), Numeric(..), Object(..), Array(..), Hash(..), String(..), Unit(..), While(..))
 import Control.Effect.Carrier
 import Control.Effect.Interpose
-import Control.Effect.Sum
 import Data.Abstract.BaseError
 import Data.Abstract.Evaluatable (UnspecializedError(..), EvalError(..), Declarations)
 import Data.Abstract.FreeVariables
diff --git a/src/Data/Abstract/Value/Type.hs b/src/Data/Abstract/Value/Type.hs
@@ -15,7 +15,6 @@ import Control.Abstract.ScopeGraph
 import qualified Control.Abstract as Abstract
 import Control.Abstract hiding (Boolean(..), Function(..), Numeric(..), Object(..), Array(..), Hash(..), String(..), Unit(..), While(..))
 import Control.Effect.Carrier
-import Control.Effect.Sum
 import Data.Abstract.BaseError
 import Data.Semigroup.Foldable (foldMap1)
 import qualified Data.Map as Map
diff --git a/src/Data/Blob.hs b/src/Data/Blob.hs
@@ -26,7 +26,6 @@ module Data.Blob
 
 import Prologue
 
-import           Control.Effect
 import           Control.Effect.Error
 import           Data.Aeson
 import qualified Data.ByteString.Lazy as BL
diff --git a/src/Data/Graph.hs b/src/Data/Graph.hs
@@ -20,7 +20,6 @@ import qualified Algebra.Graph.AdjacencyMap as A
 import           Algebra.Graph.Class (connect, overlay, vertex)
 import qualified Algebra.Graph.Class as Class
 import qualified Algebra.Graph.ToGraph as Class
-import           Control.Effect
 import           Control.Effect.State
 import           Data.Aeson
 import qualified Data.Set as Set
diff --git a/src/Data/Project.hs b/src/Data/Project.hs
@@ -13,7 +13,6 @@ module Data.Project
 import Prelude hiding (readFile)
 import Prologue
 
-import           Control.Effect
 import           Control.Effect.Error
 import           Data.Blob
 import           Data.Blob.IO
diff --git a/src/Diffing/Interpreter.hs b/src/Diffing/Interpreter.hs
@@ -5,11 +5,9 @@ module Diffing.Interpreter
 , stripDiff
 ) where
 
-import Control.Effect
 import Control.Effect.Carrier
 import Control.Effect.Cull
 import Control.Effect.NonDet
-import Control.Effect.Sum
 import qualified Data.Diff as Diff
 import Data.Term
 import Diffing.Algorithm
diff --git a/src/Language/JSON/PrettyPrint.hs b/src/Language/JSON/PrettyPrint.hs
@@ -8,7 +8,6 @@ module Language.JSON.PrettyPrint
 
 import Prologue
 
-import           Control.Effect
 import           Control.Effect.Error
 import           Streaming
 import qualified Streaming.Prelude as Streaming
diff --git a/src/Language/Python/PrettyPrint.hs b/src/Language/Python/PrettyPrint.hs
@@ -2,7 +2,6 @@
 
 module Language.Python.PrettyPrint ( printingPython ) where
 
-import Control.Effect
 import Control.Effect.Error
 import Streaming
 import qualified Streaming.Prelude as Streaming
diff --git a/src/Language/Ruby/PrettyPrint.hs b/src/Language/Ruby/PrettyPrint.hs
@@ -2,7 +2,6 @@
 
 module Language.Ruby.PrettyPrint ( printingRuby ) where
 
-import Control.Effect
 import Control.Effect.Error
 import Streaming
 import qualified Streaming.Prelude as Streaming
diff --git a/src/Parsing/TreeSitter.hs b/src/Parsing/TreeSitter.hs
@@ -7,7 +7,6 @@ module Parsing.TreeSitter
 import Prologue hiding (bracket)
 
 import qualified Control.Exception as Exc (bracket)
-import           Control.Effect
 import           Control.Effect.Resource
 import           Control.Effect.Trace
 import           Data.ByteString.Unsafe (unsafeUseAsCStringLen)
diff --git a/src/Rendering/Graph.hs b/src/Rendering/Graph.hs
@@ -8,8 +8,8 @@ module Rendering.Graph
 
 import Algebra.Graph.Export.Dot
 import Analysis.ConstructorName
-import Control.Effect
 import Control.Effect.Fresh
+import Control.Effect.Pure
 import Control.Effect.Reader
 import Control.Effect.State
 import Data.Diff
diff --git a/src/Reprinting/Translate.hs b/src/Reprinting/Translate.hs
@@ -5,8 +5,8 @@ module Reprinting.Translate
   , TranslatorC
   ) where
 
-import           Control.Effect
 import           Control.Effect.Error
+import           Control.Effect.Pure
 import           Control.Effect.State
 import           Control.Monad
 import           Streaming
diff --git a/src/Semantic/AST.hs b/src/Semantic/AST.hs
@@ -12,7 +12,6 @@ import Prologue
 import Data.ByteString.Builder
 import Data.List (intersperse)
 
-import           Control.Effect
 import           Control.Effect.Error
 import           Data.AST
 import           Data.Blob
diff --git a/src/Semantic/Analysis.hs b/src/Semantic/Analysis.hs
@@ -11,6 +11,7 @@ import qualified Data.Map.Strict as Map
 
 import Control.Abstract as Abstract
 import Control.Abstract.ScopeGraph (runAllocator)
+import Control.Effect.Carrier
 import Control.Effect.Interpose
 import Data.Abstract.Evaluatable
 import Data.Abstract.Module
diff --git a/src/Semantic/Api/Diffs.hs b/src/Semantic/Api/Diffs.hs
@@ -13,7 +13,6 @@ module Semantic.Api.Diffs
 
 import           Analysis.ConstructorName (ConstructorName)
 import           Analysis.TOCSummary (HasDeclaration)
-import           Control.Effect
 import           Control.Effect.Error
 import           Control.Exception
 import           Control.Lens
diff --git a/src/Semantic/Api/Symbols.hs b/src/Semantic/Api/Symbols.hs
@@ -7,7 +7,6 @@ module Semantic.Api.Symbols
 
 import Prelude hiding (span)
 
-import           Control.Effect
 import           Control.Effect.Error
 import           Control.Exception
 import           Control.Lens
diff --git a/src/Semantic/Api/Terms.hs b/src/Semantic/Api/Terms.hs
@@ -15,7 +15,6 @@ module Semantic.Api.Terms
 
 
 import           Analysis.ConstructorName (ConstructorName)
-import           Control.Effect
 import           Control.Effect.Error
 import           Control.Lens
 import           Control.Monad
diff --git a/src/Semantic/Distribute.hs b/src/Semantic/Distribute.hs
@@ -10,10 +10,8 @@ module Semantic.Distribute
 ) where
 
 import qualified Control.Concurrent.Async as Async
-import           Control.Effect
 import           Control.Effect.Carrier
 import           Control.Effect.Reader
-import           Control.Effect.Sum
 import           Control.Monad.IO.Unlift
 import           Control.Parallel.Strategies
 import           Prologue
diff --git a/src/Semantic/Graph.hs b/src/Semantic/Graph.hs
@@ -34,6 +34,7 @@ import           Analysis.Abstract.Collecting
 import           Analysis.Abstract.Graph as Graph
 import           Control.Abstract hiding (String)
 import           Control.Abstract.PythonPackage as PythonPackage
+import           Control.Effect.Carrier
 import           Data.Abstract.Address.Hole as Hole
 import           Data.Abstract.Address.Monovariant as Monovariant
 import           Data.Abstract.Address.Precise as Precise
diff --git a/src/Semantic/REPL.hs b/src/Semantic/REPL.hs
@@ -10,7 +10,7 @@ import Control.Abstract.Heap (runHeapError)
 import Control.Effect.Carrier
 import Control.Effect.Catch
 import Control.Effect.Resource
-import Control.Effect.Sum
+import Control.Effect.Lift
 import Control.Effect.REPL
 import Data.Abstract.Address.Precise as Precise
 import Data.Abstract.Evaluatable hiding (string)
diff --git a/src/Semantic/Resolution.hs b/src/Semantic/Resolution.hs
@@ -7,9 +7,7 @@ module Semantic.Resolution
   , ResolutionC(..)
   ) where
 
-import           Control.Effect
 import           Control.Effect.Carrier
-import           Control.Effect.Sum
 import           Data.Aeson
 import           Data.Aeson.Types (parseMaybe)
 import           Data.Blob
diff --git a/src/Semantic/Task.hs b/src/Semantic/Task.hs
@@ -57,20 +57,17 @@ module Semantic.Task
 import           Analysis.Decorator (decoratorWithAlgebra)
 import qualified Assigning.Assignment as Assignment
 import qualified Assigning.Assignment.Deterministic as Deterministic
-import qualified Control.Abstract as Analysis
-import           Control.Effect
 import           Control.Effect.Carrier
 import           Control.Effect.Catch
 import           Control.Effect.Error
+import           Control.Effect.Lift
 import           Control.Effect.Reader
 import           Control.Effect.Resource
-import           Control.Effect.Sum
 import           Control.Effect.Trace
 import           Control.Monad
 import           Control.Monad.IO.Class
 import           Data.Blob
 import           Data.ByteString.Builder
-import           Data.Coerce
 import           Data.Diff
 import qualified Data.Error as Error
 import qualified Data.Flag as Flag
diff --git a/src/Semantic/Task/Files.hs b/src/Semantic/Task/Files.hs
@@ -17,11 +17,9 @@ module Semantic.Task.Files
   , Excludes(..)
   ) where
 
-import           Control.Effect
 import           Control.Effect.Carrier
 import           Control.Effect.Catch
 import           Control.Effect.Error
-import           Control.Effect.Sum
 import           Data.Blob
 import           Data.Blob.IO
 import qualified Data.ByteString.Builder as B
diff --git a/src/Semantic/Telemetry.hs b/src/Semantic/Telemetry.hs
@@ -49,10 +49,8 @@ module Semantic.Telemetry
 , IgnoreTelemetryC(..)
 ) where
 
-import           Control.Effect
 import           Control.Effect.Carrier
 import           Control.Effect.Reader
-import           Control.Effect.Sum
 import           Control.Exception
 import           Control.Monad.IO.Class
 import qualified Data.Time.Clock.POSIX as Time (getCurrentTime)
diff --git a/src/Semantic/Timeout.hs b/src/Semantic/Timeout.hs
@@ -8,10 +8,8 @@ module Semantic.Timeout
 , Duration(..)
 ) where
 
-import           Control.Effect
 import           Control.Effect.Carrier
 import           Control.Effect.Reader
-import           Control.Effect.Sum
 import           Control.Monad.IO.Class
 import           Control.Monad.IO.Unlift
 import           Data.Duration
diff --git a/src/Semantic/Util.hs b/src/Semantic/Util.hs
@@ -19,6 +19,7 @@ import Prelude hiding (readFile)
 import           Control.Abstract
 import           Control.Abstract.Heap (runHeapError)
 import           Control.Abstract.ScopeGraph (runScopeError)
+import           Control.Effect.Lift
 import           Control.Effect.Trace (runTraceByPrinting)
 import           Control.Exception (displayException)
 import           Data.Abstract.Address.Precise as Precise
diff --git a/src/Tags/Tagging.hs b/src/Tags/Tagging.hs
@@ -8,8 +8,7 @@ where
 import Prelude hiding (fail, filter, log)
 import Prologue hiding (Element, hash)
 
-import           Control.Effect as Eff
-import           Control.Effect.State
+import           Control.Effect.State as Eff
 import           Data.Text as T hiding (empty)
 import           Streaming
 import qualified Streaming.Prelude as Streaming
diff --git a/test/Control/Abstract/Evaluator/Spec.hs b/test/Control/Abstract/Evaluator/Spec.hs
diff --git a/test/SpecHelpers.hs b/test/SpecHelpers.hs
