diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-09-06 18:51:31 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-09-07 08:53:36 -0400 |
| commit | 9400a5c6b308fbb5b3a73690610736ca3b5eb0b3 (patch) | |
| tree | 62eaa430faa7d6c15687c4b6b574997f6f3e14be | |
| parent | 4caad1660a641995caee3ee6da6fee4a93ee99b5 (diff) | |
| download | haskell-9400a5c6b308fbb5b3a73690610736ca3b5eb0b3.tar.gz | |
ghc: Remove warning of StaticPointers not being supported by GHCi
Support for StaticPointers was added in #12356 but I apparently
neglected to remove the warning.
| -rw-r--r-- | compiler/main/GHC.hs | 13 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/StaticPtr.stderr | 3 |
2 files changed, 3 insertions, 13 deletions
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index 29921de8cd..4059860680 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -332,7 +332,7 @@ import Annotations import Module import Panic import Platform -import Bag ( listToBag, unitBag ) +import Bag ( unitBag ) import ErrUtils import MonadUtils import Util @@ -344,7 +344,6 @@ import FastString import qualified Parser import Lexer import ApiAnnotation -import qualified GHC.LanguageExtensions as LangExt import NameEnv import CoreFVs ( orphNamesOfFamInst ) import FamInstEnv ( famInstEnvElts ) @@ -677,14 +676,8 @@ checkNewDynFlags dflags = do checkNewInteractiveDynFlags :: MonadIO m => DynFlags -> m DynFlags checkNewInteractiveDynFlags dflags0 = do - dflags1 <- - if xopt LangExt.StaticPointers dflags0 - then do liftIO $ printOrThrowWarnings dflags0 $ listToBag - [mkPlainWarnMsg dflags0 interactiveSrcSpan - $ text "StaticPointers is not supported in GHCi interactive expressions."] - return $ xopt_unset dflags0 LangExt.StaticPointers - else return dflags0 - return dflags1 + -- Nothing to be done here + return dflags0 -- %************************************************************************ diff --git a/testsuite/tests/ghci/scripts/StaticPtr.stderr b/testsuite/tests/ghci/scripts/StaticPtr.stderr deleted file mode 100644 index b45f64e64d..0000000000 --- a/testsuite/tests/ghci/scripts/StaticPtr.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -<interactive>: warning: - StaticPointers is not supported in GHCi interactive expressions. |