diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-21 23:30:05 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-22 00:24:25 +0200 |
| commit | feac0a3bc69fd376231aa3c83d031c131156ddb9 (patch) | |
| tree | ad94a04d30869efe5a9d021f3fe2923269b5bfbd /testsuite/tests | |
| parent | 9aa73892e10e90a1799b9277da593e816a827364 (diff) | |
| download | haskell-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')
| -rw-r--r-- | testsuite/tests/ado/ado-optimal.hs | 4 | ||||
| -rw-r--r-- | testsuite/tests/ado/ado001.hs | 4 | ||||
| -rw-r--r-- | testsuite/tests/callarity/unittest/CallArity1.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/rename/should_fail/T10618.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/rename/should_fail/T10618.stderr | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/tests/ado/ado-optimal.hs b/testsuite/tests/ado/ado-optimal.hs index d67aa4fb1a..5e3266e8c2 100644 --- a/testsuite/tests/ado/ado-optimal.hs +++ b/testsuite/tests/ado/ado-optimal.hs @@ -3,7 +3,7 @@ module Main where import Control.Applicative -import Text.PrettyPrint +import Text.PrettyPrint as PP (a:b:c:d:e:f:g:h:_) = map (\c -> doc [c]) ['a'..] @@ -64,7 +64,7 @@ instance Monad M where (Nothing,Nothing) -> (Nothing, b) (Just d, Nothing) -> (Just d, b) (Nothing, Just d) -> (Just d, b) - (Just d1, Just d2) -> (Just (maybeParen p (d1 <> semi <+> d2)), b) + (Just d1, Just d2) -> (Just (maybeParen p (d1 PP.<> semi <+> d2)), b) doc :: String -> M () doc d = M $ \_ -> (Just (text d), ()) diff --git a/testsuite/tests/ado/ado001.hs b/testsuite/tests/ado/ado001.hs index 0d466c5fd1..6abce177e0 100644 --- a/testsuite/tests/ado/ado001.hs +++ b/testsuite/tests/ado/ado001.hs @@ -2,7 +2,7 @@ module Main where import Control.Applicative -import Text.PrettyPrint +import Text.PrettyPrint as PP (a:b:c:d:e:f:g:h:_) = map (\c -> doc [c]) ['a'..] @@ -175,7 +175,7 @@ instance Monad M where (Nothing,Nothing) -> (Nothing, b) (Just d, Nothing) -> (Just d, b) (Nothing, Just d) -> (Just d, b) - (Just d1, Just d2) -> (Just (maybeParen p (d1 <> semi <+> d2)), b) + (Just d1, Just d2) -> (Just (maybeParen p (d1 PP.<> semi <+> d2)), b) doc :: String -> M () doc d = M $ \_ -> (Just (text d), ()) diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs index 8fd8feb548..1100ff6a8f 100644 --- a/testsuite/tests/callarity/unittest/CallArity1.hs +++ b/testsuite/tests/callarity/unittest/CallArity1.hs @@ -172,7 +172,7 @@ main = do case lintExpr dflags [f,scrutf,scruta] e of Just msg -> putMsg dflags (msg $$ text "in" <+> text n) Nothing -> return () - putMsg dflags (text n <> char ':') + putMsg dflags (text n Outputable.<> char ':') -- liftIO $ putMsg dflags (ppr e) let e' = callArityRHS e let bndrs = nonDetEltsUniqSet (allBoundIds e') 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) |