Fix some validation errors

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 ||

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
             )