remove redundant imports

Clean build under ghc 8.8.3, which seems to do better at finding cases
where two imports both provide the same symbol, and warns about one of
them.

This commit was sponsored by Ilya Shlyakhter on Patreon.
This commit is contained in:
Joey Hess 2020-06-22 11:03:28 -04:00
parent 6ef62cb3c7
commit aa1ad0b7ca
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
13 changed files with 7 additions and 17 deletions

View file

@ -13,7 +13,7 @@ import Command
import Logs.Config
import Config
import Types.GitConfig (globalConfigs)
import Git.Types (ConfigKey(..), fromConfigValue)
import Git.Types (fromConfigValue)
import qualified Data.ByteString.Char8 as S8

View file

@ -30,7 +30,6 @@ import Logs.UUID
import Logs.Trust
import Logs.Location
import Annex.NumCopies
import Remote
import Git.Config (boolConfig)
import qualified Git.LsTree as LsTree
import Utility.Percentage
@ -319,11 +318,11 @@ showStat s = maybe noop calc =<< s
repo_list :: TrustLevel -> Stat
repo_list level = stat n $ nojson $ lift $ do
us <- filter (/= NoUUID) . M.keys
<$> (M.union <$> (M.map fromUUIDDesc <$> uuidDescMap) <*> remoteMap Remote.name)
<$> (M.union <$> (M.map fromUUIDDesc <$> uuidDescMap) <*> Remote.remoteMap Remote.name)
rs <- fst <$> trustPartition level us
countRepoList (length rs)
-- This also handles json display.
<$> prettyPrintUUIDs n rs
<$> Remote.prettyPrintUUIDs n rs
where
n = showTrustLevel level ++ " repositories"
@ -497,9 +496,9 @@ reposizes_stats = stat desc $ nojson $ do
. M.toList
<$> cachedRepoData
let maxlen = maximum (map (length . snd) l)
descm <- lift uuidDescriptions
descm <- lift Remote.uuidDescriptions
-- This also handles json display.
s <- lift $ prettyPrintUUIDsWith (Just "size") desc descm (Just . show) $
s <- lift $ Remote.prettyPrintUUIDsWith (Just "size") desc descm (Just . show) $
map (\(u, sz) -> (u, Just $ mkdisp sz maxlen)) l
return $ countRepoList (length l) s
where

View file

@ -14,7 +14,6 @@ import qualified Data.Map as M
import Command
import Annex.SpecialRemote
import qualified Remote
import qualified Logs.Remote
import qualified Types.Remote as R
import Types.RemoteConfig
import Annex.UUID

View file

@ -13,7 +13,6 @@ import Annex.Action
import Annex
import Utility.Rsync
import Types.Transfer
import Types.Remote (RetrievalSecurityPolicy(..))
import Command.SendKey (fieldTransfer)
import qualified CmdLine.GitAnnexShell.Fields as Fields

View file

@ -31,7 +31,7 @@ import Types.StandardGroups
import Types.ScheduledActivity
import Types.NumCopies
import Remote
import Git.Types (ConfigKey(..), fromConfigKey, fromConfigValue)
import Git.Types (fromConfigKey, fromConfigValue)
cmd :: Command
cmd = command "vicfg" SectionSetup "edit configuration in git-annex branch"