diff options
| author | David Terei <davidterei@gmail.com> | 2011-10-25 15:15:37 -0700 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2011-10-25 15:15:37 -0700 |
| commit | 4e2121f4fa33743d0acb42506b4d34952a7e4c80 (patch) | |
| tree | 0c570f7b9779519840e8b5441ab430d3a4845c3f | |
| parent | 1d6c2cf962c8e1db4c2445fa0247481f212fe34a (diff) | |
| download | haskell-4e2121f4fa33743d0acb42506b4d34952a7e4c80.tar.gz | |
Fix some validation errors
| -rw-r--r-- | compiler/main/DynFlags.hs | 6 | ||||
| -rw-r--r-- | compiler/main/HscMain.lhs | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 1c047b7cfe..537e2b4dfe 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1037,12 +1037,6 @@ safeLanguageOn dflags = safeHaskell dflags == Sf_Safe safeInferOn :: DynFlags -> Bool safeInferOn dflags = safeHaskell dflags == Sf_SafeInfered --- | Turn off Safe Haskell inference mode (set module to unsafe) -setSafeInferOff :: DynFlags -> DynFlags -setSafeInferOff dflags - | safeHaskell dflags == Sf_SafeInfered = dflags { safeHaskell = Sf_None } - | otherwise = dflags - -- | Test if Safe Imports are on in some form safeImportsOn :: DynFlags -> Bool safeImportsOn dflags = safeHaskell dflags == Sf_Unsafe || diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs index 3961de0d3b..08ae763107 100644 --- a/compiler/main/HscMain.lhs +++ b/compiler/main/HscMain.lhs @@ -904,7 +904,7 @@ checkSafeImports dflags hsc_env tcg_env -- See the Note [ Safe Haskell Inference] when (not $ isEmptyBag errs) ( -- did we fail safe inference or fail -XSafe? - case safeHaskell dflags == Sf_SafeInfered of + case safeInferOn dflags of True -> setDynFlags (dflags { safeHaskell = Sf_None } ) False -> liftIO . throwIO . mkSrcErr $ errs ) |