Fix haddock opts field naming scheme

sjakobi · sjakobi · commit 82b7e8d65b80 · 2016-07-21T14:04:34.000+02:00
diff --git a/src/Stack/Build/Haddock.hs b/src/Stack/Build/Haddock.hs
@@ -229,7 +229,7 @@ generateHaddockIndex descr envOverride wc hdopts dumpPackages docRelFP destDir =
                 (Just destDir)
                 envOverride
                 (haddockExeName wc)
-                (toHaddockArgs hdopts ++
+                (hoAdditionalArgs hdopts ++
                  ["--gen-contents", "--gen-index"] ++
                  [x | (xs,_,_,_) <- interfaceOpts, x <- xs])
   where
diff --git a/src/Stack/Config/Build.hs b/src/Stack/Config/Build.hs
@@ -54,7 +54,7 @@ buildOptsFromMonoid BuildOptsMonoid{..} = BuildOpts
 haddockOptsFromMonoid :: HaddockOptsMonoid -> HaddockOpts
 haddockOptsFromMonoid HaddockOptsMonoid{..} =
     defaultHaddockOpts
-    {toHaddockArgs = toMonoidHaddockArgs}
+    {hoAdditionalArgs = hoMonoidAdditionalArgs}
 
 testOptsFromMonoid :: TestOptsMonoid -> TestOpts
 testOptsFromMonoid TestOptsMonoid{..} =
diff --git a/src/Stack/Types/Config/Build.hs b/src/Stack/Types/Config/Build.hs
@@ -296,27 +296,27 @@ instance Monoid TestOptsMonoid where
 
 -- | Haddock Options
 data HaddockOpts =
-  HaddockOpts { toHaddockArgs :: ![String] -- ^ Arguments passed to haddock program
+  HaddockOpts { hoAdditionalArgs :: ![String] -- ^ Arguments passed to haddock program
               } deriving (Eq,Show)
 
 data HaddockOptsMonoid =
-  HaddockOptsMonoid {toMonoidHaddockArgs :: ![String]
+  HaddockOptsMonoid {hoMonoidAdditionalArgs :: ![String]
                     } deriving (Show, Generic)
 
 defaultHaddockOpts :: HaddockOpts
-defaultHaddockOpts = HaddockOpts {toHaddockArgs = []}
+defaultHaddockOpts = HaddockOpts {hoAdditionalArgs = []}
 
 instance FromJSON (WithJSONWarnings HaddockOptsMonoid) where
   parseJSON = withObjectWarnings "HaddockOptsMonoid"
-    (\o -> do toMonoidHaddockArgs <- o ..:? toMonoidHaddockArgsName ..!= []
+    (\o -> do hoMonoidAdditionalArgs <- o ..:? hoMonoidAdditionalArgsName ..!= []
               return HaddockOptsMonoid{..})
 
 instance Monoid HaddockOptsMonoid where
   mempty = memptydefault
   mappend = mappenddefault
 
-toMonoidHaddockArgsName :: Text
-toMonoidHaddockArgsName = "haddock-args"
+hoMonoidAdditionalArgsName :: Text
+hoMonoidAdditionalArgsName = "haddock-args"
 
 
 -- | Options for the 'FinalAction' 'DoBenchmarks'
