git.iko.soy/typeable/haskell-stack-trace-plugin
on c9ce176 help sign in
6624a59
swap
0 ahead, 11 behind
2 files changed+5−11
since splitsnapshots
unifiedsplit
haskell-stack-trace-plugin.cabal+2−2 src/StackTrace/Plugin.hs+3−9
haskell-stack-trace-plugin.cabal+2−2
@@ -32,13 +32,13 @@ flag dev
3232 default: False
3333
3434common common-opts
35− build-depends: base >=4.12 && <4.18
35+ build-depends: base >=4.12 && <4.16
3636 default-language: Haskell2010
3737
3838library
3939 import: common-opts
4040 hs-source-dirs: src
41− build-depends: ghc ^>=8.6 || ^>=8.8 || ^>=8.10 || ^>=9.0 || ^>=9.2 || ^>=9.4
41+ build-depends: ghc ^>=8.6 || ^>=8.8 || ^>=8.10 || ^>=9.0
4242 exposed-modules: StackTrace.Plugin
4343
4444 if flag(dev)
src/StackTrace/Plugin.hs+3−9
@@ -5,7 +5,6 @@ module StackTrace.Plugin (plugin) where
55
66import Control.Arrow (first)
77import Data.Monoid (Any(Any, getAny))
8−import GHC.Types.SrcLoc
98#if __GLASGOW_HASKELL__ >= 900
109import GHC.Plugins
1110#else
@@ -50,14 +49,9 @@ importDeclQualified = QualifiedPre
5049
5150ghcStackImport :: Located (ImportDecl (GhcPass p))
5251ghcStackImport =
53− L srcSpan $
52+ noLoc $
5453 (simpleImportDecl $ mkModuleName "GHC.Stack")
55− { ideclQualified = importDeclQualified, ideclAs = Just $ noLoc ghcStackModuleName }
56− where
57− -- This is for GHC-9 related problems. @noLoc@ causes GHC to throw warnings
58− -- about unused imports. Even if the import is used
59− -- See: https://github.com/waddlaw/haskell-stack-trace-plugin/issues/16
60− srcSpan = RealSrcSpan (realSrcLocSpan $ mkRealSrcLoc "haskell-stack-trace-plugin:very-unique-file-name-to-avoid-collision" 1 1) Nothing
54+ {ideclQualified = importDeclQualified, ideclAs = Just $ noLoc ghcStackModuleName}
6155
6256#if __GLASGOW_HASKELL__ >= 900
6357updateHsModule :: HsModule -> HsModule
@@ -176,7 +170,7 @@ updateHsType ty@HsAppTy {} =
176170 flagASTModified $ HsQualTy xQualTy (noLoc $ appendHSC []) (noLoc ty)
177171updateHsType ty@HsFunTy {} =
178172 flagASTModified $ HsQualTy xQualTy (noLoc $ appendHSC []) (noLoc ty)
179−updateHsType ty@HsListTy {} =
173+updateHsType ty@HsListTy {} =
180174 flagASTModified $ HsQualTy xQualTy (noLoc $ appendHSC []) (noLoc ty)
181175updateHsType ty@HsTupleTy {} =
182176 flagASTModified $ HsQualTy xQualTy (noLoc $ appendHSC []) (noLoc ty)