summaryrefslogtreecommitdiff
path: root/testsuite/tests/rename
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2017-09-21 23:30:05 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2017-09-22 00:24:25 +0200
commitfeac0a3bc69fd376231aa3c83d031c131156ddb9 (patch)
treead94a04d30869efe5a9d021f3fe2923269b5bfbd /testsuite/tests/rename
parent9aa73892e10e90a1799b9277da593e816a827364 (diff)
downloadhaskell-feac0a3bc69fd376231aa3c83d031c131156ddb9.tar.gz
Reexport Semigroup's <> operator from Prelude (#14191)
This completes the 2nd phase of the Semigroup=>Monoid Proposal (SMP) initiated in 8ae263ceb3566a7c82336400b09cb8f381217405. This updates a couple submodules to address <> naming clashes.
Diffstat (limited to 'testsuite/tests/rename')
-rw-r--r--testsuite/tests/rename/should_fail/T10618.hs2
-rw-r--r--testsuite/tests/rename/should_fail/T10618.stderr6
2 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/rename/should_fail/T10618.hs b/testsuite/tests/rename/should_fail/T10618.hs
index 28b665f6fb..d69cf3d409 100644
--- a/testsuite/tests/rename/should_fail/T10618.hs
+++ b/testsuite/tests/rename/should_fail/T10618.hs
@@ -1,3 +1,3 @@
module T10618 where
-foo = Just $ Nothing <> Nothing
+foo = Just $ Nothing <|> Nothing
diff --git a/testsuite/tests/rename/should_fail/T10618.stderr b/testsuite/tests/rename/should_fail/T10618.stderr
index 8b4dc2c28d..2d478744e1 100644
--- a/testsuite/tests/rename/should_fail/T10618.stderr
+++ b/testsuite/tests/rename/should_fail/T10618.stderr
@@ -1,6 +1,6 @@
T10618.hs:3:22: error:
- • Variable not in scope: (<>) :: Maybe (Maybe a0) -> Maybe a1 -> t
+ • Variable not in scope: (<|>) :: Maybe (Maybe a0) -> Maybe a1 -> t
• Perhaps you meant one of these:
- ‘<$>’ (imported from Prelude), ‘*>’ (imported from Prelude),
- ‘<$’ (imported from Prelude)
+ ‘<$>’ (imported from Prelude), ‘<*>’ (imported from Prelude),
+ ‘<>’ (imported from Prelude)