[commit: ghc] master: Remove references to static flags in flag reference (bf775e9)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bf775e9d6895c07f629409ee18503f40730cb5a0/ghc

>---------------------------------------------------------------

commit bf775e9d6895c07f629409ee18503f40730cb5a0
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Fri Jun 2 11:48:57 2017 -0400

    Remove references to static flags in flag reference
    
    A follow-up to #8440 (Ditch static flags). There are still some
    lingering references to static flags in the flag reference, so let's
    modify those references accordingly.
    
    Test Plan: Build the documentation
    
    Reviewers: bgamari, austin
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3615


>---------------------------------------------------------------

bf775e9d6895c07f629409ee18503f40730cb5a0
 utils/mkUserGuidePart/Main.hs                      | 3 +--
 utils/mkUserGuidePart/Options/CompilerDebugging.hs | 4 ++--
 utils/mkUserGuidePart/Options/Optimizations.hs     | 4 ++--
 utils/mkUserGuidePart/Types.hs                     | 4 +---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/utils/mkUserGuidePart/Main.hs b/utils/mkUserGuidePart/Main.hs
index 344c808..d517048 100644
--- a/utils/mkUserGuidePart/Main.hs
+++ b/utils/mkUserGuidePart/Main.hs
@@ -49,7 +49,7 @@ whatGlasgowExtsDoes = unlines
 flagsTable :: [Flag] -> ReST
 flagsTable theFlags =
     table [50, 100, 30, 55]
-          ["Flag", "Description", "Static/Dynamic", "Reverse"]
+          ["Flag", "Description", "Type", "Reverse"]
           (map flagRow theFlags)
   where
     flagRow flag =
@@ -60,7 +60,6 @@ flagsTable theFlags =
         ]
       where
         type_ = case flagType flag of
-                  StaticFlag          -> "static"
                   DynamicFlag         -> "dynamic"
                   DynamicSettableFlag -> "dynamic/``:set``"
                   ModeFlag            -> "mode"
diff --git a/utils/mkUserGuidePart/Options/CompilerDebugging.hs b/utils/mkUserGuidePart/Options/CompilerDebugging.hs
index c886156..9704020 100644
--- a/utils/mkUserGuidePart/Options/CompilerDebugging.hs
+++ b/utils/mkUserGuidePart/Options/CompilerDebugging.hs
@@ -175,11 +175,11 @@ compilerDebuggingOptions =
          }
   , flag { flagName = "-dno-debug-output"
          , flagDescription = "Suppress unsolicited debugging output"
-         , flagType = StaticFlag
+         , flagType = DynamicFlag
          }
   , flag { flagName = "-dppr-debug"
          , flagDescription = "Turn on debug printing (more verbose)"
-         , flagType = StaticFlag
+         , flagType = DynamicFlag
          }
   , flag { flagName = "-dppr-user-length"
          , flagDescription =
diff --git a/utils/mkUserGuidePart/Options/Optimizations.hs b/utils/mkUserGuidePart/Options/Optimizations.hs
index 992390b..afefc6e 100644
--- a/utils/mkUserGuidePart/Options/Optimizations.hs
+++ b/utils/mkUserGuidePart/Options/Optimizations.hs
@@ -209,7 +209,7 @@ optimizationsOptions =
          }
   , flag { flagName = "-fno-opt-coercion"
          , flagDescription = "Turn off the coercion optimiser"
-         , flagType = StaticFlag
+         , flagType = DynamicFlag
          }
   , flag { flagName = "-fno-pre-inlining"
          , flagDescription = "Turn off pre-inlining"
@@ -220,7 +220,7 @@ optimizationsOptions =
            "Turn off the \"state hack\" whereby any lambda with a real-world "++
            "state token as argument is considered to be single-entry. Hence "++
            "OK to inline things inside it."
-         , flagType = StaticFlag
+         , flagType = DynamicFlag
          }
   , flag { flagName = "-fomit-interface-pragmas"
          , flagDescription =
diff --git a/utils/mkUserGuidePart/Types.hs b/utils/mkUserGuidePart/Types.hs
index 33474da..340672e 100644
--- a/utils/mkUserGuidePart/Types.hs
+++ b/utils/mkUserGuidePart/Types.hs
@@ -1,8 +1,6 @@
 module Types where
 
-data FlagType = StaticFlag
-                -- ^ Static flag
-              | DynamicFlag
+data FlagType = DynamicFlag
                 -- ^ Dynamic flag
               | DynamicSettableFlag
                 -- ^ Dynamic flag on which @:set@ can be used in GHCi