0e20658 · typeable/haskell-stack-trace-plugin

git.iko.soy/typeable/haskell-stack-trace-plugin

Merge pull request #10 from waddlaw/release

v0.1.2.0

commit0e206588cd18f5b278cf2b4266e500fbf924f784 authorShinya Yamaguchi <waddlaw@users.noreply.github.com> dateFri 21 May 2021, 16:13 (5 years ago) parentd18c37a 6d47954

6 files changed+48−42

compare with master

unifiedsplit

.github/workflows/cabal.yml+16−28 .gitignore+2−1 CHANGELOG.md+5 LICENSE+1−1 haskell-stack-trace-plugin.cabal+10−12 src/StackTrace/Plugin.hs+14

.github/workflows/cabal.yml+16−28

@@ -2,13 +2,9 @@ name: cabal

33on:

44 push:

5− branches:

6− - master

7− tags-ignore:

8− - '*'

5+ branches: [ master ]

96 pull_request:

10− branches:

11− - '*'

7+ branches: [ '*' ]

128 schedule:

139 - cron: "00 15 * * *"

1410

@@ -17,40 +13,32 @@ jobs:

1713 runs-on: ubuntu-18.04

1814 strategy:

1915 matrix:

20− ghc: ["8.6.5", "8.8.1", "8.10.4"]

21− cabal: ["3.0"]

16+ ghc: ["8.6", "8.8", "8.10", "9.0"]

17+ cabal: ["3.2"]

18+ cache-version: ["2021-05-21"]

2219

2320 steps:

2421 - uses: actions/checkout@v2

25− - uses: actions/setup-haskell@v1

22+ - uses: haskell/actions/setup@v1

2623 with:

2724 ghc-version: ${{ matrix.ghc }}

2825 cabal-version: ${{ matrix.cabal }}

2926

30− - name: Display ghc & cabal version

31− run: |

32− ghc -V

33− cabal -V

34−

3527 - name: Cache ~/.cabal/store

36− uses: actions/cache@v1.1.0

37− with:

38− path: ~/.cabal/store

39− key: ${{ matrix.ghc }}-v0-cabal-store-${{ hashFiles('*.cabal') }}

40−

41− - name: Cache dist-newstyle

42− uses: actions/cache@v1.1.0

28+ uses: actions/cache@v2

4329 with:

44− path: dist-newstyle

45− key: ${{ matrix.ghc }}-v0-cabal-dist-${{ hashFiles('*.cabal') }}

30+ path: |

31+ ~/.cabal/store

32+ dist-newstyle

33+ key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cache-version }}-cabal

4634

4735 - name: Install dependencies

4836 run: |

49− cabal v2-update

50− cabal v2-configure --disable-optimization --enable-tests --write-ghc-environment-files=always -j2

51− cabal v2-build --only-dependencies

37+ cabal update

38+ cabal configure --disable-optimization --enable-tests --write-ghc-environment-files=always -j2

39+ cabal build --only-dependencies

5240

5341 - name: Build & Test

5442 run: |

55− cabal v2-build --flag dev

56− cabal v2-test --flag dev

43+ cabal build --flag dev

44+ cabal test --flag dev

.gitignore+2−1

@@ -3,4 +3,5 @@ dist-*/

33.ghc.environment.*

44cabal.project.local

6−*~

6+*~

7+tasks.json

CHANGELOG.md+5

@@ -2,6 +2,11 @@

33## Unreleased changes

5+## 0.1.2.0 -- 2021-05-21

7+- Added support for GHC 8.10 [#7](https://github.com/waddlaw/haskell-stack-trace-plugin/pull/7) (@etorreborre)

8+- Added support for GHC 9.0 @waddlaw

510## 0.1.1.1 -- 2020-01-18

611

712- Allow GHC-8.8.1

LICENSE+1−1

@@ -1,4 +1,4 @@

33Permission is hereby granted, free of charge, to any person obtaining

44a copy of this software and associated documentation files (the

haskell-stack-trace-plugin.cabal+10−12

@@ -12,15 +12,15 @@ bug-reports:

1212license: MIT

1313license-file: LICENSE

1414author: Shinya Yamaguchi

15−maintainer: ingronze@gmail.com

16−copyright: 2018-2020 Shinya Yamaguchi

15+maintainer: a@wado.dev

16+copyright: 2018-2021 Shinya Yamaguchi

1717category: Compiler Plugin, Development, Debug

1818build-type: Simple

1919extra-source-files:

2020 CHANGELOG.md

2121 Readme.md

2222

23−tested-with: GHC ==8.6.5 || ==8.8.1 || ==8.10.4

23+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1

2424

2525source-repository head

2626 type: git

@@ -32,22 +32,20 @@ flag dev

3232 default: False

3333

3434common common-opts

35− build-depends: base >=4.12 && <4.15

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

41+ build-depends: ghc ^>=8.6 || ^>=8.8 || ^>=8.10 || ^>=9.0

4242 exposed-modules: StackTrace.Plugin

4343

4444 if flag(dev)

4545 ghc-options:

4646 -Wall -Werror -Wcompat -Wincomplete-uni-patterns

47− -Wnoncanonical-monad-instances

48− -Wno-missing-home-modules

47+ -Wnoncanonical-monad-instances -Wno-missing-home-modules

4948

50− -- -Wincomplete-record-updates

5149 else

5250 ghc-options: -Wall

5351

@@ -57,11 +55,11 @@ test-suite test

5755 hs-source-dirs: test

5856 type: exitcode-stdio-1.0

5957 build-depends:

60− , bytestring ^>=0.10

61− , hspec ^>=2.7

62− , typed-process ^>=0.2.6

58+ , bytestring >=0.10 && <0.12

59+ , hspec ^>=2.8

60+ , typed-process ^>=0.2

6361

64− build-tool-depends: hspec-discover:hspec-discover ^>=2.7

62+ build-tool-depends: hspec-discover:hspec-discover ^>=2.8

6563 other-modules: StackTrace.PluginSpec

6664

6765 if flag(dev)

src/StackTrace/Plugin.hs+14

@@ -5,7 +5,12 @@ module StackTrace.Plugin (plugin) where

66import Control.Arrow (first)

77import Data.Monoid (Any(Any, getAny))

8+#if __GLASGOW_HASKELL__ >= 900

9+import GHC.Plugins

10+#else

11+

812import GhcPlugins

13+#endif

914#if __GLASGOW_HASKELL__ >= 810

1015import GHC.Hs

1116#endif

@@ -48,7 +53,11 @@ ghcStackImport =

4853 (simpleImportDecl $ mkModuleName "GHC.Stack")

4954 {ideclQualified = importDeclQualified, ideclAs = Just $ noLoc ghcStackModuleName}

5055

56+#if __GLASGOW_HASKELL__ >= 900

57+updateHsModule :: HsModule -> HsModule

58+#else

5159updateHsModule :: HsModule GhcPs -> HsModule GhcPs

60+#endif

5261updateHsModule hsm =

5362 hsm {hsmodImports = hsmodImports', hsmodDecls = hsmodDecls'}

5463 where

@@ -90,12 +99,16 @@ updateSig _ sig = pure sig

9099updateLHsSigWsType :: Traversal' (LHsSigWcType GhcPs) (LHsSigType GhcPs)

91100updateLHsSigWsType f lhs@HsWC {} =

92101 (\x -> lhs {hswc_body = x}) <$> f (hswc_body lhs)

102+#if __GLASGOW_HASKELL__ < 900

93103updateLHsSigWsType _ lhs = pure lhs

104+#endif

94105

95106updateLHsSigType :: Traversal' (LHsSigType GhcPs) (LHsType GhcPs)

96107updateLHsSigType f lhs@HsIB {} =

97108 (\x -> lhs {hsib_body = x}) <$> f (hsib_body lhs)

109+#if __GLASGOW_HASKELL__ < 900

98110updateLHsSigType _ lhs = pure lhs

111+#endif

99112

100113updateLHsType :: Traversal' (LHsType GhcPs) (HsType GhcPs)

101114updateLHsType = traverse

@@ -117,6 +130,7 @@ updateHsType ty@HsTupleTy {} =

117130updateHsType ty = pure ty

118131

119132#if __GLASGOW_HASKELL__ < 810

133+xQualTy :: NoExt

120134xQualTy = noExt

121135#else

122136xQualTy :: NoExtField