diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2017-06-02 11:48:57 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-06-02 12:27:45 -0400 |
| commit | bf775e9d6895c07f629409ee18503f40730cb5a0 (patch) | |
| tree | 2036cd5a0bd1acb0c62357af3b4b0691d43634d7 | |
| parent | d0fb0df349d0e51b2b3f7980a8b1eca80051d67f (diff) | |
| download | haskell-bf775e9d6895c07f629409ee18503f40730cb5a0.tar.gz | |
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
| -rw-r--r-- | utils/mkUserGuidePart/Main.hs | 3 | ||||
| -rw-r--r-- | utils/mkUserGuidePart/Options/CompilerDebugging.hs | 4 | ||||
| -rw-r--r-- | utils/mkUserGuidePart/Options/Optimizations.hs | 4 | ||||
| -rw-r--r-- | 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 344c808534..d517048d36 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 c886156d80..9704020601 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 992390ba3d..afefc6e2a5 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 33474dae73..340672e3b6 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 |