rejigger imports for clean build with ghc 7.10's AMP changes

The explict import Prelude after import Control.Applicative is a trick
to avoid a warning.

Crypto.hs

@@ -35,7 +35,6 @@ module Crypto (
 
 import qualified Data.ByteString.Lazy as L
 import Data.ByteString.UTF8 (fromString)
-import Control.Applicative
 import qualified Data.Map as M
 import Control.Monad.IO.Class
 

Database/Fsck.hs

@@ -25,6 +25,7 @@ import qualified Database.Handle as H
 import Locations
 import Utility.PosixFiles
 import Utility.Exception
+import Common
 import Annex
 import Types.Key
 import Types.UUID
@@ -33,13 +34,6 @@ import Annex.LockFile
 
 import Database.Persist.TH
 import Database.Esqueleto hiding (Key)
-import Control.Monad
-import Control.Monad.IfElse
-import Control.Monad.IO.Class (liftIO)
-import System.Directory
-import System.FilePath
-import Data.Maybe
-import Control.Applicative
 
 data FsckHandle = FsckHandle H.DbHandle UUID
 

Logs/Difference.hs

@@ -12,7 +12,6 @@ module Logs.Difference (
 	module Logs.Difference.Pure
 ) where
 
-import Data.Monoid
 import Data.Time.Clock.POSIX
 import qualified Data.Map as M
 

Logs/Difference/Pure.hs

@@ -10,7 +10,6 @@ module Logs.Difference.Pure (
 	parseDifferencesLog,
 ) where
 
-import Data.Monoid
 import qualified Data.Map as M
 
 import Common.Annex

Test.hs

@@ -14,7 +14,6 @@ import Test.Tasty.Runners
 import Test.Tasty.HUnit
 import Test.Tasty.QuickCheck
 import Test.Tasty.Ingredients.Rerun
-import Data.Monoid
 
 import Options.Applicative hiding (command)
 import qualified Data.Map as M

Types/DesktopNotify.hs

@@ -8,6 +8,7 @@
 module Types.DesktopNotify where
 
 import Data.Monoid
+import Prelude
 
 data DesktopNotify = DesktopNotify
 	{ notifyStart :: Bool

Types/Difference.hs

@@ -20,9 +20,10 @@ import Utility.PartialPrelude
 import qualified Git
 import qualified Git.Config
 
+import qualified Data.Set as S
 import Data.Maybe
 import Data.Monoid
-import qualified Data.Set as S
+import Prelude
 
 -- Describes differences from the v5 repository format.
 --

Utility/Directory.hs

@@ -18,6 +18,7 @@ import Control.Applicative
 import Control.Concurrent
 import System.IO.Unsafe (unsafeInterleaveIO)
 import Data.Maybe
+import Prelude
 
 #ifdef mingw32_HOST_OS
 import qualified System.Win32 as Win32

Utility/Env.hs

@@ -13,6 +13,7 @@ module Utility.Env where
 import Utility.Exception
 import Control.Applicative
 import Data.Maybe
+import Prelude
 import qualified System.Environment as E
 import qualified System.SetEnv
 #else

Utility/FreeDesktop.hs

@@ -39,6 +39,7 @@ import Data.List
 import Data.String.Utils
 import Data.Maybe
 import Control.Applicative
+import Prelude
 
 type DesktopEntry = [(Key, Value)]
 

Utility/Gpg.hs

@@ -9,14 +9,8 @@
 
 module Utility.Gpg where
 
-import Control.Applicative
-import Control.Concurrent
-import Control.Monad.IO.Class
-import qualified Data.Map as M
-
 import Common
 import qualified Build.SysConfig as SysConfig
-
 #ifndef mingw32_HOST_OS
 import System.Posix.Types
 import qualified System.Posix.IO
@@ -27,6 +21,10 @@ import Utility.Tmp
 #endif
 import Utility.Format (decode_c)
 
+import Control.Concurrent
+import Control.Monad.IO.Class
+import qualified Data.Map as M
+
 type KeyId = String
 
 newtype KeyIds = KeyIds { keyIds :: [KeyId] }

Utility/HumanTime.hs

@@ -20,11 +20,12 @@ import Utility.PartialPrelude
 import Utility.Applicative
 import Utility.QuickCheck
 
+import qualified Data.Map as M
 import Data.Time.Clock
 import Data.Time.Clock.POSIX (POSIXTime)
 import Data.Char
 import Control.Applicative
-import qualified Data.Map as M
+import Prelude
 
 newtype Duration = Duration { durationSeconds :: Integer }
 	deriving (Eq, Ord, Read, Show)

Utility/LinuxMkLibs.hs

@@ -7,7 +7,12 @@
 
 module Utility.LinuxMkLibs where
 
-import Control.Applicative
+import Utility.PartialPrelude
+import Utility.Directory
+import Utility.Process
+import Utility.Monad
+import Utility.Path
+
 import Data.Maybe
 import System.Directory
 import System.FilePath
@@ -15,12 +20,8 @@ import Data.List.Utils
 import System.Posix.Files
 import Data.Char
 import Control.Monad.IfElse
-
-import Utility.PartialPrelude
-import Utility.Directory
-import Utility.Process
-import Utility.Monad
-import Utility.Path
+import Control.Applicative
+import Prelude
 
 {- Installs a library. If the library is a symlink to another file,
  - install the file it links to, and update the symlink to be relative. -}

Utility/Misc.hs

@@ -9,20 +9,21 @@
 
 module Utility.Misc where
 
+import Utility.FileSystemEncoding
+import Utility.Monad
+
 import System.IO
 import Control.Monad
 import Foreign
 import Data.Char
 import Data.List
-import Control.Applicative
 import System.Exit
 #ifndef mingw32_HOST_OS
 import System.Posix.Process (getAnyProcessStatus)
 import Utility.Exception
 #endif
-
-import Utility.FileSystemEncoding
-import Utility.Monad
+import Control.Applicative
+import Prelude
 
 {- A version of hgetContents that is not lazy. Ensures file is 
  - all read before it gets closed. -}

Utility/Mounts.hsc

@@ -26,6 +26,7 @@ import Utility.Exception
 import Data.Maybe
 import Control.Applicative
 #endif
+import Prelude
 
 {- This is a stripped down mntent, containing only
  - fields available everywhere. -}

Utility/Network.hs

@@ -11,6 +11,7 @@ import Utility.Process
 import Utility.Exception
 
 import Control.Applicative
+import Prelude
 
 {- Haskell lacks uname(2) bindings, except in the
  - Bindings.Uname addon. Rather than depend on that,

Utility/Path.hs

@@ -16,6 +16,7 @@ import Data.List
 import Data.Maybe
 import Data.Char
 import Control.Applicative
+import Prelude
 
 #ifdef mingw32_HOST_OS
 import qualified System.FilePath.Posix as Posix

Utility/Process.hs

@@ -54,6 +54,7 @@ import qualified System.Posix.IO
 import Control.Applicative
 #endif
 import Data.Maybe
+import Prelude
 
 import Utility.Misc
 import Utility.Exception

Utility/QuickCheck.hs

@@ -19,6 +19,7 @@ import System.Posix.Types
 import qualified Data.Map as M
 import qualified Data.Set as S
 import Control.Applicative
+import Prelude
 
 instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where
 	arbitrary = M.fromList <$> arbitrary

Utility/SRV.hs

@@ -25,8 +25,9 @@ import Utility.PartialPrelude
 import Network
 import Data.Function
 import Data.List
-import Control.Applicative
 import Data.Maybe
+import Control.Applicative
+import Prelude
 
 #ifdef WITH_ADNS
 import ADNS.Resolver

Utility/SafeCommand.hs

@@ -10,9 +10,10 @@ module Utility.SafeCommand where
 import System.Exit
 import Utility.Process
 import Data.String.Utils
-import Control.Applicative
 import System.FilePath
 import Data.Char
+import Control.Applicative
+import Prelude
 
 {- A type for parameters passed to a shell command. A command can
  - be passed either some Params (multiple parameters can be included,

Utility/Scheduled.hs

@@ -32,7 +32,6 @@ import Utility.QuickCheck
 import Utility.PartialPrelude
 import Utility.Misc
 
-import Control.Applicative
 import Data.List
 import Data.Time.Clock
 import Data.Time.LocalTime
@@ -41,6 +40,8 @@ import Data.Time.Calendar.WeekDate
 import Data.Time.Calendar.OrdinalDate
 import Data.Tuple.Utils
 import Data.Char
+import Control.Applicative
+import Prelude
 
 {- Some sort of scheduled event. -}
 data Schedule = Schedule Recurrance ScheduledTime

Utility/UserInfo.hs

@@ -13,12 +13,13 @@ module Utility.UserInfo (
 	myUserGecos,
 ) where
 
+import Utility.Env
+
 import System.PosixCompat
 #ifndef mingw32_HOST_OS
 import Control.Applicative
 #endif
-
-import Utility.Env
+import Prelude
 
 {- Current user's home directory.
  -