Organized imports

src/backend-ghc/Language/Haskell/Tools/AST/FromGHC/Binds.hs

@@ -7,17 +7,17 @@ module Language.Haskell.Tools.AST.FromGHC.Binds where
 import ApiAnnotation as GHC (AnnKeywordId(..))
 import Bag as GHC (bagToList)
 import BasicTypes as GHC (FixityDirection(..), Fixity(..))
+import BasicTypes as GHC
 import HsBinds as GHC
 import HsExpr as GHC
 import HsPat as GHC (LPat)
 import HsTypes as GHC (HsWildCardBndrs(..), HsImplicitBndrs(..))
+import Outputable as GHC (Outputable(..), showSDocUnsafe)
 import SrcLoc as GHC
-import Outputable as GHC
-import BasicTypes as GHC
 
+import Control.Monad.Reader (Monad(..), mapM, asks)
+import Data.Data (Data(..))
 import Data.List
-import Data.Data
-import Control.Monad.Reader
 
 import Language.Haskell.Tools.AST.FromGHC.Exprs (trfExpr)
 import Language.Haskell.Tools.AST.FromGHC.Monad

src/backend-ghc/Language/Haskell/Tools/AST/FromGHC/Exprs.hs

@@ -14,10 +14,10 @@ import Data.Maybe (Maybe(..), isJust, fromMaybe)
 
 import BasicTypes as GHC (Boxity(..))
 import GHC
+import OccName as GHC (occNameString)
 import Outputable as GHC (Outputable(..), showSDocUnsafe)
 import PrelNames as GHC (negateName)
 import SrcLoc as GHC
-import OccName as GHC
 
 import {-# SOURCE #-} Language.Haskell.Tools.AST.FromGHC.Binds (trfRhsGuard', trfWhereLocalBinds, trfLocalBinds)
 import Language.Haskell.Tools.AST.FromGHC.GHCUtils (GHCName(..), getFieldOccName)

src/backend-ghc/Language/Haskell/Tools/AST/FromGHC/Patterns.hs

@@ -14,7 +14,6 @@ import HsPat as GHC
 import HsTypes as GHC (HsWildCardBndrs(..), HsImplicitBndrs(..), HsConDetails(..))
 import Language.Haskell.Tools.AST.FromGHC.GHCUtils (getFieldOccName)
 import SrcLoc as GHC
-import Outputable as GHC
 
 import {-# SOURCE #-} Language.Haskell.Tools.AST.FromGHC.Exprs (trfExpr)
 import Language.Haskell.Tools.AST.FromGHC.Literals (trfLiteral', trfOverloadedLit)
@@ -27,8 +26,6 @@ import Language.Haskell.Tools.AST.FromGHC.Utils
 import Language.Haskell.Tools.AST (Ann, Dom, RangeStage)
 import qualified Language.Haskell.Tools.AST as AST
 
-import Debug.Trace
-
 trfPattern :: TransformName n r => Located (Pat n) -> Trf (Ann AST.UPattern (Dom r) RangeStage)
 -- field wildcards are not directly represented in GHC AST
 trfPattern (L l (ConPatIn name (RecCon (HsRecFields flds _)))) | any ((l ==) . getLoc) flds 

src/cli/Language/Haskell/Tools/Refactor/CLI.hs

@@ -15,16 +15,16 @@ import Data.List
 import Data.List.Split
 import Data.Maybe
 import System.Directory
-import System.IO
 import System.Exit
+import System.IO
 
+import DynFlags as GHC
 import ErrUtils
 import GHC
 import GHC.Paths ( libdir )
 import HscTypes as GHC
-import DynFlags as GHC
-import Packages
 import Outputable
+import Packages
 
 import Language.Haskell.Tools.PrettyPrint
 import Language.Haskell.Tools.Refactor

src/cli/benchmark/Main.hs

@@ -155,7 +155,7 @@ makeCliTest wd rfs = do
     inHandle <- newFileHandle inKnob "<input>" ReadMode
     outKnob <- newKnob (BS.pack [])
     outHandle <- newFileHandle outKnob "<output>" WriteMode
-    refactorSession inHandle outHandle [wd]
+    void $ refactorSession inHandle outHandle [wd]
   `finally` do removeDirectoryRecursive wd
                renameDirectory (wd ++ "_orig") wd
 

src/refactor/Language/Haskell/Tools/Refactor/GetModules.hs

@@ -12,10 +12,10 @@ import Data.Function (on)
 import Data.List (intersperse, find, sortBy)
 import qualified Data.Map as Map
 import Data.Maybe
+import Distribution.Compiler
 import Distribution.ModuleName (components)
 import Distribution.ModuleName
 import Distribution.Package (Dependency(..), PackageName(..), pkgName)
-import Distribution.Compiler
 import Distribution.PackageDescription
 import Distribution.PackageDescription.Configuration
 import Distribution.PackageDescription.Parse

src/refactor/Language/Haskell/Tools/Refactor/Prepare.hs

@@ -19,13 +19,13 @@ import FastString
 import GHC hiding (loadModule)
 import qualified GHC (loadModule)
 import GHC.Paths ( libdir )
-import SrcLoc
 import Packages
+import SrcLoc
 
 import Control.Exception
 import Control.Monad
-import Control.Monad.Trans
 import Control.Monad.IO.Class
+import Control.Monad.Trans
 import Data.IntSet (member)
 import Data.List ((\\), intersperse, isSuffixOf)
 import Data.List.Split

src/refactor/Language/Haskell/Tools/Refactor/RefactorBase.hs

@@ -22,10 +22,10 @@ import Exception (ExceptionMonad(..))
 import GHC (Ghc, GhcMonad(..), TyThing(..), lookupName)
 import qualified Module as GHC
 import qualified Name as GHC
+import Outputable
 import qualified PrelNames as GHC
 import qualified TyCon as GHC
 import qualified TysWiredIn as GHC
-import Outputable
 
 import Control.Exception
 import Control.Monad.Reader