pinned-warnings 0.1.1.0 → 0.1.2.0

raw patch · 5 files changed

+12/−65 lines, 5 filesdep ~containersdep ~ghcPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: containers, ghc

API changes (from Hackage documentation)

Files

• CHANGELOG.md +5/−1
• pinned-warnings.cabal +4/−4
• src/Internal/GhcFacade.hs +0/−19
• src/Internal/Types.hs +1/−16
• src/PinnedWarnings.hs +2/−25

@@ -1,9 +1,13 @@ # Revision history for pinned-warnings +## 0.1.2.0+* Support GHC 9.10.x+* Drop support for GHC 9.2+ ## 0.1.1.0  * Support GHC 9.8.x-* Drop support for GHC 9.2 and 8.10+* Drop support for GHC 8.10  ## 0.1.0.14 

@@ -4,7 +4,7 @@ -- http://haskell.org/cabal/users-guide/  name:                pinned-warnings-version:             0.1.1.0+version:             0.1.2.0 synopsis: Preserve warnings in a GHCi session description: Please see the README on GitHub at <https://github.com/aaronallen8455/pinned-warnings#readme> homepage:       https://github.com/aaronallen8455/pinned-warnings#readme@@ -19,7 +19,7 @@ extra-source-files:   README.md   CHANGELOG.md-tested-with: GHC ==9.2.2 || ==9.4.2 || ==9.6.1 || ==9.8.1+tested-with: GHC ==9.4.2 || ==9.6.1 || ==9.8.1 || ==9.10.1  library   exposed-modules:     PinnedWarnings@@ -28,10 +28,10 @@                        Internal.GhcFacade                        Internal.Types -  build-depends:       ghc              >= 9.2 && < 9.9,+  build-depends:       ghc              >= 9.4 && < 9.11,                        base             >= 4.16.0 && < 5,                        bytestring       >= 0.11.3 && < 0.13,-                       containers       >= 0.6.5 && < 0.7,+                       containers       >= 0.6.5 && < 0.8,                        directory        >= 1.3.6 && < 1.4,                        time             >= 1.11.1 && < 1.13,                        transformers     >= 0.5.6 && < 0.7

@@ -50,25 +50,6 @@ import GHC.Utils.Outputable as X import GHC.Driver.Config.Diagnostic as X -#elif MIN_VERSION_ghc(9,2,0)-import GHC as X hiding (FunDep)-import GHC.Core.Class as X-import GHC.Core.Make as X-import GHC.Data.Bag as X-import GHC.Data.FastString as X-import GHC.Data.IOEnv as X-import GHC.Driver.Plugins as X hiding (TcPlugin)-import GHC.Driver.Env.Types as X-import GHC.Tc.Plugin as X-import GHC.Tc.Types as X-import GHC.Tc.Types.Constraint as X-import GHC.Tc.Types.Evidence as X-import GHC.Types.Error as X-import GHC.Types.Name.Occurrence as X-import GHC.Types.SrcLoc as X-import GHC.Utils.Error as X-import GHC.Utils.Logger as X-import GHC.Utils.Outputable as X #endif  #if MIN_VERSION_ghc(9,4,0)

@@ -19,17 +19,10 @@ type ModuleFile = String  newtype Warning = Warning-  { unWarning-#if MIN_VERSION_ghc(9,4,0)-      :: Ghc.MsgEnvelope Ghc.DiagnosticMessage-#elif MIN_VERSION_ghc(9,2,0)-      :: Ghc.MsgEnvelope Ghc.DecoratedSDoc-#endif-  }+  { unWarning :: Ghc.MsgEnvelope Ghc.DiagnosticMessage }  showWarning :: Warning -> String showWarning =-#if MIN_VERSION_ghc(9,4,0)   let sdocCtx = Ghc.defaultSDocContext               { Ghc.sdocPrintUnicodeSyntax = True               , Ghc.sdocCanUseUnicode = True@@ -42,14 +35,6 @@       . Ghc.diagnosticMessage #endif       . Ghc.errMsgDiagnostic . unWarning-#elif MIN_VERSION_ghc(9,2,0)-  let sdocCtx = Ghc.defaultSDocContext-              { Ghc.sdocPrintUnicodeSyntax = True-              , Ghc.sdocCanUseUnicode = True-              }-   in foldMap (Ghc.showSDocOneLine sdocCtx)-      . Ghc.unDecorated . Ghc.errMsgDiagnostic . unWarning-#endif  instance Eq Warning where   Warning a == Warning b = show a == show b

@@ -8,7 +8,9 @@ import           Control.Monad import           Control.Monad.IO.Class import           Data.IORef+#if !MIN_VERSION_ghc(9,10,0) import           Data.List+#endif import qualified Data.Map.Strict as M import           Data.Maybe import qualified Data.Set as S@@ -147,9 +149,6 @@     $ \messages ->         (Ghc.mkMessages ((fmap . fmap) Ghc.TcRnUnknownMessage pinnedWarns)           `Ghc.unionMessages` messages, ())-#elif MIN_VERSION_ghc(9,2,0)-    $ \messages ->-        (Ghc.mkMessages pinnedWarns `Ghc.unionMessages` messages, ()) #endif  -- | Remove warnings for modules that no longer exist@@ -185,7 +184,6 @@   pure parsedModule  -- | Taps into the log action to capture the warnings that GHC emits.-#if MIN_VERSION_ghc(9,4,0) addWarningCapture :: Ghc.HscEnv -> Ghc.HscEnv addWarningCapture hscEnv =   hscEnv@@ -216,27 +214,6 @@             addWarningToGlobalState start end modFile warn         _ -> pure ()       logAction dynFlags messageClass srcSpan sdoc-#elif MIN_VERSION_ghc(9,2,0)-addWarningCapture :: Ghc.HscEnv -> Ghc.HscEnv-addWarningCapture hscEnv =-  hscEnv-    { Ghc.hsc_logger = Ghc.pushLogHook warningsHook (Ghc.hsc_logger hscEnv)-    }-  where-    warningsHook :: Ghc.LogAction -> Ghc.LogAction-    warningsHook logAction dynFlags warnReason severity srcSpan sdoc = do-      case severity of-        Ghc.SevWarning-          | Ghc.RealSrcLoc start _ <- Ghc.srcSpanStart srcSpan-          , Ghc.RealSrcLoc end _ <- Ghc.srcSpanEnd srcSpan-          , Just modFile <- Ghc.srcSpanFileName_maybe srcSpan-          -> do-            let warn = Warning $ Ghc.mkPlainWarnMsg srcSpan sdoc-            addWarningToGlobalState start end modFile warn-        _ -> pure ()--      logAction dynFlags warnReason severity srcSpan sdoc-#endif  -- | Adds a warning to the global state variable addWarningToGlobalState