Remove recently added '--no-profile' / '--no-trace' - unnecessary

Author: mgsloan

src/Stack/Config/Build.hs

@@ -68,8 +68,8 @@ buildOptsFromMonoid BuildOptsMonoid{..} = BuildOpts
   where
     -- These options are not directly used in bopts, instead they
     -- transform other options.
-    tracing = fromFirst False buildMonoidTrace
-    profiling = fromFirst False buildMonoidProfile
+    tracing = getAny buildMonoidTrace
+    profiling = getAny buildMonoidProfile
     noStripping = getAny buildMonoidNoStrip
     -- Additional args for tracing / profiling
     additionalArgs =

src/Stack/Options/BuildMonoidParser.hs

@@ -26,20 +26,28 @@ buildOptsMonoidParser hide0 =
     hideExceptGhci =
         hideMods (hide0 `notElem` [BuildCmdGlobalOpts, GhciCmdGlobalOpts])
 
-    trace =
-        firstBoolFlags
-            "trace"
-            "Enable profiling in libraries, executables, etc. \
-                \for all expressions and generate a backtrace on \
-                \exception"
-            hideExceptGhci
-    profile =
-        firstBoolFlags
-            "profile"
-            "profiling in libraries, executables, etc. \
-                \for all expressions and generate a profiling report\
-                \ in tests or benchmarks"
-            hideExceptGhci
+    -- These use 'Any' because they are not settable in stack.yaml, so
+    -- there is no need for options like --no-profile.
+    trace = Any <$>
+        flag
+            False
+            True
+            (long "trace" <>
+             help
+                 "Enable profiling in libraries, executables, etc. \
+                     \for all expressions and generate a backtrace on \
+                     \exception" <>
+             hideExceptGhci)
+    profile = Any <$>
+        flag
+            False
+            True
+            (long "profile" <>
+             help
+                 "profiling in libraries, executables, etc. \
+                     \for all expressions and generate a profiling report\
+                     \ in tests or benchmarks" <>
+             hideExceptGhci)
     noStrip = Any <$>
         flag
              False
@@ -52,6 +60,7 @@ buildOptsMonoidParser hide0 =
                       \debuggers/profiling tools/other utilities that use \
                       \debugging symbols." <>
              hideExceptGhci)
+
     libProfiling =
         firstBoolFlags
             "library-profiling"

src/Stack/Types/Config/Build.hs

@@ -149,8 +149,8 @@ data BuildCommand
 
 -- | Build options that may be specified in the stack.yaml or from the CLI
 data BuildOptsMonoid = BuildOptsMonoid
-    { buildMonoidTrace :: !(First Bool)
-    , buildMonoidProfile :: !(First Bool)
+    { buildMonoidTrace :: !Any
+    , buildMonoidProfile :: !Any
     , buildMonoidNoStrip :: !Any
     , buildMonoidLibProfile :: !(First Bool)
     , buildMonoidExeProfile :: !(First Bool)
@@ -176,8 +176,8 @@ data BuildOptsMonoid = BuildOptsMonoid
 
 instance FromJSON (WithJSONWarnings BuildOptsMonoid) where
   parseJSON = withObjectWarnings "BuildOptsMonoid"
-    (\o -> do let buildMonoidTrace = First Nothing
-                  buildMonoidProfile = First Nothing
+    (\o -> do let buildMonoidTrace = Any False
+                  buildMonoidProfile = Any False
                   buildMonoidNoStrip = Any False
               buildMonoidLibProfile <- First <$> o ..:? buildMonoidLibProfileArgName
               buildMonoidExeProfile <-First <$>  o ..:? buildMonoidExeProfileArgName