diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-14 14:20:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-14 14:20:10 -0400 |
| commit | 5a3f41a50d1fd94a18fcced49722f3087e36aec6 (patch) | |
| tree | a053b3ce52c8d6693ef3f70b188a818cfc89dc85 /Command/Vicfg.hs | |
| parent | 9f5b8638a990f8d163afaf62e15331515fdcb21f (diff) | |
doh't use "def" for command definitions, it conflicts with Data.Default.def
Diffstat (limited to 'Command/Vicfg.hs')
| -rw-r--r-- | Command/Vicfg.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs index 834fde4e1..faa2d3f05 100644 --- a/Command/Vicfg.hs +++ b/Command/Vicfg.hs @@ -29,8 +29,8 @@ import Types.StandardGroups import Types.ScheduledActivity import Remote -def :: [Command] -def = [command "vicfg" paramNothing seek +cmd :: [Command] +cmd = [command "vicfg" paramNothing seek SectionSetup "edit git-annex's configuration"] seek :: CommandSeek @@ -101,7 +101,7 @@ defCfg curcfg = Cfg } where mapdef :: forall k v. Default v => M.Map k v -> M.Map k v - mapdef = M.map (const Data.Default.def) + mapdef = M.map (const def) diffCfg :: Cfg -> Cfg -> Cfg diffCfg curcfg newcfg = Cfg @@ -142,7 +142,7 @@ genCfg cfg descs = unlines $ intercalate [""] , com "(Valid trust levels: " ++ trustlevels ++ ")" ] (\(t, u) -> line "trust" u $ showTrustLevel t) - (\u -> lcom $ line "trust" u $ showTrustLevel Data.Default.def) + (\u -> lcom $ line "trust" u $ showTrustLevel def) where trustlevels = unwords $ map showTrustLevel [Trusted .. DeadTrusted] |