[commit: testsuite] master: Follow changes in FastString (f204104)

Ian Lynagh igloo at earth.li
Fri Jul 20 15:54:25 CEST 2012


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f204104cd71f3312dcb605a35737b4ff4290a378

>---------------------------------------------------------------

commit f204104cd71f3312dcb605a35737b4ff4290a378
Author: Ian Lynagh <igloo at earth.li>
Date:   Sun Jul 15 02:01:15 2012 +0100

    Follow changes in FastString

>---------------------------------------------------------------

 tests/plugins/simple-plugin/Simple/Plugin.hs      |    2 +-
 tests/simplCore/should_compile/T4930.stderr       |    2 +-
 tests/simplCore/should_compile/spec-inline.stderr |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/plugins/simple-plugin/Simple/Plugin.hs b/tests/plugins/simple-plugin/Simple/Plugin.hs
index 118ccdb..be62a52 100644
--- a/tests/plugins/simple-plugin/Simple/Plugin.hs
+++ b/tests/plugins/simple-plugin/Simple/Plugin.hs
@@ -70,7 +70,7 @@ changeExpr anns mb_replacement e = let go = changeExpr anns mb_replacement in ca
                 Nothing -> return e
                 Just replacement -> do
                         putMsgS "Performing Replacement"
-                        return $ Lit (MachStr (mkFastString replacement))
+                        return $ Lit (MachStr (fastStringToFastBytes (mkFastString replacement)))
         App e1 e2 -> liftM2 App (go e1) (go e2)
         Lam b e -> liftM (Lam b) (go e)
         Let bind e -> liftM2 Let (changeBind anns mb_replacement bind) (go e)
diff --git a/tests/simplCore/should_compile/T4930.stderr b/tests/simplCore/should_compile/T4930.stderr
index 41e3996..61c2f5a 100644
--- a/tests/simplCore/should_compile/T4930.stderr
+++ b/tests/simplCore/should_compile/T4930.stderr
@@ -4,7 +4,7 @@ Result size of Tidy Core = {terms: 20, types: 10, coercions: 0}
 
 lvl :: [GHC.Types.Char]
 [GblId]
-lvl = GHC.CString.unpackCString# "Too small"
+lvl = GHC.CString.unpackCString# "Too small"#
 
 T4930.foo1 :: GHC.Types.Int
 [GblId, Str=DmdType b]
diff --git a/tests/simplCore/should_compile/spec-inline.stderr b/tests/simplCore/should_compile/spec-inline.stderr
index f69fffd..e639507 100644
--- a/tests/simplCore/should_compile/spec-inline.stderr
+++ b/tests/simplCore/should_compile/spec-inline.stderr
@@ -6,7 +6,7 @@ Roman.foo3 :: GHC.Types.Int
 [GblId, Str=DmdType b]
 Roman.foo3 =
   Control.Exception.Base.patError
-    @ GHC.Types.Int "spec-inline.hs:(19,5)-(29,25)|function go"
+    @ GHC.Types.Int "spec-inline.hs:(19,5)-(29,25)|function go"#
 
 Rec {
 Roman.foo_$s$wgo [Occ=LoopBreaker]





More information about the Cvs-ghc mailing list