diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2018-11-10 01:12:52 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-03-22 10:34:51 -0400 |
| commit | ab51bee40c82cd552bcf13e24b67d43f3b8d25f3 (patch) | |
| tree | a75a4102576dad50af44e342fb9152e7270792eb /testsuite/tests/backpack | |
| parent | cd07086ada34888c08585f4dc98a961618748ed0 (diff) | |
| download | haskell-ab51bee40c82cd552bcf13e24b67d43f3b8d25f3.tar.gz | |
base: Remove `Monad(fail)` method and reexport `MonadFail(fail)` instead
As per https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
Coauthored-by: Ben Gamari <ben@well-typed.com>
Diffstat (limited to 'testsuite/tests/backpack')
5 files changed, 12 insertions, 12 deletions
diff --git a/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal b/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal index 4c3f673750..b9752674bd 100644 --- a/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal +++ b/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal @@ -18,19 +18,19 @@ cabal-version: >=2 library library-a signatures: A.Sig exposed-modules: B - build-depends: base >=4.12 && <4.13 + build-depends: base == 4.13.* hs-source-dirs: library-a default-language: Haskell2010 library library-a-impl exposed-modules: A - build-depends: base >=4.12 && <4.13 + build-depends: base == 4.13.* hs-source-dirs: library-a-impl default-language: Haskell2010 library library-b exposed-modules: C - build-depends: base >=4.12 && <4.13 + build-depends: base == 4.13.* , library-a hs-source-dirs: library-b default-language: Haskell2010 @@ -40,7 +40,7 @@ library mixins: library-a requires (A.Sig as A) , library-b requires (A.Sig as A) reexported-modules: A, B, C - build-depends: base >=4.12 && <4.13 + build-depends: base == 4.13.* , library-a , library-a-impl , library-b diff --git a/testsuite/tests/backpack/should_compile/bkp16.stderr b/testsuite/tests/backpack/should_compile/bkp16.stderr index 4a5f2d04d2..4017e4700e 100644 --- a/testsuite/tests/backpack/should_compile/bkp16.stderr +++ b/testsuite/tests/backpack/should_compile/bkp16.stderr @@ -2,7 +2,7 @@ [1 of 1] Compiling Int[sig] ( p/Int.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[Int=base-4.12.0.0:GHC.Exts] - Instantiating p[Int=base-4.12.0.0:GHC.Exts] + [1 of 1] Including p[Int=base-4.13.0.0:GHC.Exts] + Instantiating p[Int=base-4.13.0.0:GHC.Exts] [1 of 1] Including ghc-prim-0.5.3 [1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-97PZnzqiJmd2hTwUNGdjod/Int.o ) diff --git a/testsuite/tests/backpack/should_fail/bkpfail16.stderr b/testsuite/tests/backpack/should_fail/bkpfail16.stderr index c893ebae35..b3bea76954 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail16.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail16.stderr @@ -2,8 +2,8 @@ [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[ShouldFail=base-4.12.0.0:Data.Bool] - Instantiating p[ShouldFail=base-4.12.0.0:Data.Bool] + [1 of 1] Including p[ShouldFail=base-4.13.0.0:Data.Bool] + Instantiating p[ShouldFail=base-4.13.0.0:Data.Bool] [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/ShouldFail.o ) bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/../ShouldFail.hi:1:1: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail17.stderr b/testsuite/tests/backpack/should_fail/bkpfail17.stderr index 02ee990c90..7bd5c5778d 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail17.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail17.stderr @@ -2,8 +2,8 @@ [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[ShouldFail=base-4.12.0.0:Prelude] - Instantiating p[ShouldFail=base-4.12.0.0:Prelude] + [1 of 1] Including p[ShouldFail=base-4.13.0.0:Prelude] + Instantiating p[ShouldFail=base-4.13.0.0:Prelude] [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail17.out/p/p-2W6J7O3LvroH97zGxbPEGF/ShouldFail.o ) <no location info>: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail19.stderr b/testsuite/tests/backpack/should_fail/bkpfail19.stderr index 03fdcd7d16..a66eca5e60 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail19.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail19.stderr @@ -2,8 +2,8 @@ [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[ShouldFail=base-4.12.0.0:Data.STRef] - Instantiating p[ShouldFail=base-4.12.0.0:Data.STRef] + [1 of 1] Including p[ShouldFail=base-4.13.0.0:Data.STRef] + Instantiating p[ShouldFail=base-4.13.0.0:Data.STRef] [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail19.out/p/p-CfyUIAu1JTRCDuXEyGszXN/ShouldFail.o ) <no location info>: error: |