diff options
| author | Richard Eisenberg <eir@cis.upenn.edu> | 2014-11-11 07:58:03 -0500 |
|---|---|---|
| committer | Richard Eisenberg <eir@cis.upenn.edu> | 2014-11-12 12:36:43 -0500 |
| commit | fe6a51715a23e2ee31e1d03b71f06c4417e964e0 (patch) | |
| tree | 3d062a45c4c171912fae586942f6001ccc705020 /testsuite | |
| parent | e6e45a1c497eae37fbc5daf5e201fe97181e840c (diff) | |
| download | haskell-fe6a51715a23e2ee31e1d03b71f06c4417e964e0.tar.gz | |
Testsuite wibble due to #9404
[skip ci]
Diffstat (limited to 'testsuite')
5 files changed, 12 insertions, 10 deletions
diff --git a/testsuite/tests/ghci/scripts/ghci046.script b/testsuite/tests/ghci/scripts/ghci046.script index f07e06f330..28c5cde050 100644 --- a/testsuite/tests/ghci/scripts/ghci046.script +++ b/testsuite/tests/ghci/scripts/ghci046.script @@ -12,8 +12,8 @@ type instance OR HTrue HTrue = HTrue type instance OR HTrue HFalse = HTrue type instance OR HFalse HTrue = HTrue type instance OR HFalse HFalse = HFalse -:t undefined :: AND HTrue HTrue -:t undefined :: AND (OR HFalse HTrue) (OR HTrue HFalse) +:kind! AND HTrue HTrue +:kind! AND (OR HFalse HTrue) (OR HTrue HFalse) let t = undefined :: AND HTrue HTrue let f = undefined :: AND HTrue HFalse type instance AND HTrue HTrue = HFalse diff --git a/testsuite/tests/ghci/scripts/ghci046.stdout b/testsuite/tests/ghci/scripts/ghci046.stdout index d600596b71..c4e7cf3fc7 100644 --- a/testsuite/tests/ghci/scripts/ghci046.stdout +++ b/testsuite/tests/ghci/scripts/ghci046.stdout @@ -1,4 +1,6 @@ -undefined :: AND HTrue HTrue :: HTrue -undefined :: AND (OR HFalse HTrue) (OR HTrue HFalse) :: HTrue +AND HTrue HTrue :: * += HTrue +AND (OR HFalse HTrue) (OR HTrue HFalse) :: * += HTrue t :: HTrue t :: HFalse diff --git a/testsuite/tests/typecheck/should_fail/T5570.stderr b/testsuite/tests/typecheck/should_fail/T5570.stderr index 21a4e0cfbe..15d5c8a19e 100644 --- a/testsuite/tests/typecheck/should_fail/T5570.stderr +++ b/testsuite/tests/typecheck/should_fail/T5570.stderr @@ -2,7 +2,7 @@ T5570.hs:7:16: Couldn't match kind ‘*’ with ‘#’ When matching types - s0 :: * + r0 :: * Double# :: # In the second argument of ‘($)’, namely ‘D# $ 3.0##’ In the expression: print $ D# $ 3.0## diff --git a/testsuite/tests/typecheck/should_fail/T7857.stderr b/testsuite/tests/typecheck/should_fail/T7857.stderr index 6517b774f9..698d280ad9 100644 --- a/testsuite/tests/typecheck/should_fail/T7857.stderr +++ b/testsuite/tests/typecheck/should_fail/T7857.stderr @@ -1,10 +1,10 @@ T7857.hs:8:11: - Could not deduce (PrintfType s0) arising from a use of ‘printf’ + Could not deduce (PrintfType r0) arising from a use of ‘printf’ from the context (PrintfArg t) bound by the inferred type of g :: PrintfArg t => t -> b at T7857.hs:8:1-21 - The type variable ‘s0’ is ambiguous + The type variable ‘r0’ is ambiguous Note: there are several potential instances: instance [safe] (PrintfArg a, PrintfType r) => PrintfType (a -> r) -- Defined in ‘Text.Printf’ diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr index 058b06392f..0198f3c67c 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr @@ -3,8 +3,8 @@ tcfail133.hs:2:61: Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language. tcfail133.hs:68:7: - No instance for (Show s0) arising from a use of ‘show’ - The type variable ‘s0’ is ambiguous + No instance for (Show r0) arising from a use of ‘show’ + The type variable ‘r0’ is ambiguous Note: there are several potential instances: instance Show Zero -- Defined at tcfail133.hs:8:29 instance Show One -- Defined at tcfail133.hs:9:28 @@ -17,7 +17,7 @@ tcfail133.hs:68:7: foo = show $ add (One :@ Zero) (One :@ One) tcfail133.hs:68:14: - No instance for (AddDigit (Zero :@ (One :@ One)) One s0) + No instance for (AddDigit (Zero :@ (One :@ One)) One r0) arising from a use of ‘add’ In the second argument of ‘($)’, namely ‘add (One :@ Zero) (One :@ One)’ |