diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-10 16:50:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-10 16:51:03 -0400 |
| commit | de36a9187796b05958a09f6ee89671c5f23a23ea (patch) | |
| tree | 6ce797ebd458ddbf3923988ac9c1500d2e11b43b | |
| parent | bb55606e26b98f09ffc54ac571a34e92a1f481e4 (diff) | |
couple of AMP warnings I missed before
| -rw-r--r-- | Assistant/Types/BranchChange.hs | 3 | ||||
| -rw-r--r-- | Git/LsTree.hs | 7 | ||||
| -rw-r--r-- | Logs/TimeStamp.hs | 4 | ||||
| -rw-r--r-- | Utility/ExternalSHA.hs | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Assistant/Types/BranchChange.hs b/Assistant/Types/BranchChange.hs index f769657d0..4c15f133a 100644 --- a/Assistant/Types/BranchChange.hs +++ b/Assistant/Types/BranchChange.hs @@ -8,7 +8,8 @@ module Assistant.Types.BranchChange where import Control.Concurrent.MSampleVar -import Common.Annex +import Control.Applicative +import Prelude newtype BranchChangeHandle = BranchChangeHandle (MSampleVar ()) diff --git a/Git/LsTree.hs b/Git/LsTree.hs index 7ef951807..8294f7b93 100644 --- a/Git/LsTree.hs +++ b/Git/LsTree.hs @@ -13,10 +13,6 @@ module Git.LsTree ( parseLsTree ) where -import Numeric -import Control.Applicative -import System.Posix.Types - import Common import Git import Git.Command @@ -24,6 +20,9 @@ import Git.Sha import Git.FilePath import qualified Git.Filename +import Numeric +import System.Posix.Types + data TreeItem = TreeItem { mode :: FileMode , typeobj :: String diff --git a/Logs/TimeStamp.hs b/Logs/TimeStamp.hs index ca2670953..0891f920b 100644 --- a/Logs/TimeStamp.hs +++ b/Logs/TimeStamp.hs @@ -14,8 +14,8 @@ import Data.Time #if ! MIN_VERSION_time(1,5,0) import System.Locale #endif - -import Common +import Control.Applicative +import Prelude {- Parses how POSIXTime shows itself: "1431286201.113452s" - Also handles the format with no fractional seconds. -} diff --git a/Utility/ExternalSHA.hs b/Utility/ExternalSHA.hs index 234b074bf..0defbaa16 100644 --- a/Utility/ExternalSHA.hs +++ b/Utility/ExternalSHA.hs @@ -20,8 +20,9 @@ import Utility.Exception import Data.List import Data.Char -import Control.Applicative import System.IO +import Control.Applicative +import Prelude externalSHA :: String -> Int -> FilePath -> IO (Either String String) externalSHA command shasize file = do |