[commit: ghc] ghc-8.0: Testsuite: delete Windows line endings [skip ci] (#11631) (e2defb8)
git at git.haskell.org
git at git.haskell.org
Sat Feb 27 14:39:46 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/e2defb838d57d49a1dd0daded5f1c5f353f3d508/ghc
>---------------------------------------------------------------
commit e2defb838d57d49a1dd0daded5f1c5f353f3d508
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Mon Feb 22 21:31:35 2016 +0100
Testsuite: delete Windows line endings [skip ci] (#11631)
(cherry picked from commit 8626ac91a3cac028bbe742f07a1ce9fb598589f6)
>---------------------------------------------------------------
e2defb838d57d49a1dd0daded5f1c5f353f3d508
testsuite/tests/rts/T2047.hs | 0
testsuite/tests/simplCore/should_compile/T4201.hs | 0
testsuite/tests/simplCore/should_compile/T5366.hs | 0
testsuite/tests/simplCore/should_compile/T7287.hs | 0
testsuite/tests/simplCore/should_compile/rule1.hs | 4 ++--
testsuite/tests/simplCore/should_run/T5441.hs | 0
testsuite/tests/simplCore/should_run/T5441a.hs | 0
testsuite/tests/stranal/should_compile/T8037.hs | 0
testsuite/tests/th/T2597a.hs | 0
testsuite/tests/th/T2597a_Lib.hs | 2 +-
testsuite/tests/th/T2597b.hs | 0
testsuite/tests/th/T2597b_Lib.hs | 0
testsuite/tests/th/T2700.hs | 0
testsuite/tests/th/T2713.hs | 0
testsuite/tests/th/T3395.hs | 0
testsuite/tests/th/T3467.hs | 0
testsuite/tests/th/T5404.hs | 0
testsuite/tests/th/T5410.hs | 0
testsuite/tests/th/T5665.hs | 0
testsuite/tests/th/T5737.hs | 0
testsuite/tests/th/T8954.hs | 0
testsuite/tests/th/TH_1tuple.hs | 6 +++---
testsuite/tests/th/TH_NestedSplices.hs | 0
testsuite/tests/th/TH_NestedSplices_Lib.hs | 0
testsuite/tests/typecheck/should_compile/FD2.hs | 0
testsuite/tests/typecheck/should_compile/FD4.hs | 0
testsuite/tests/typecheck/should_compile/GivenTypeSynonym.hs | 0
testsuite/tests/typecheck/should_compile/T2572.hs | 0
testsuite/tests/typecheck/should_compile/T5120.hs | 0
testsuite/tests/typecheck/should_compile/T5595.hs | 0
testsuite/tests/typecheck/should_compile/T7268.hs | 0
testsuite/tests/typecheck/should_compile/T7384.hs | 0
testsuite/tests/typecheck/should_compile/T7888.hs | 0
testsuite/tests/typecheck/should_compile/faxen.hs | 4 ++--
testsuite/tests/typecheck/should_compile/tc190.hs | 0
testsuite/tests/typecheck/should_compile/tc240.hs | 0
testsuite/tests/typecheck/should_compile/tc247.hs | 0
testsuite/tests/typecheck/should_fail/FailDueToGivenOverlapping.hs | 0
testsuite/tests/typecheck/should_fail/LongWayOverlapping.hs | 0
testsuite/tests/typecheck/should_fail/SCLoop.hs | 0
testsuite/tests/typecheck/should_fail/T2126.hs | 0
testsuite/tests/typecheck/should_fail/T2714.hs | 0
testsuite/tests/typecheck/should_fail/T3406.hs | 0
testsuite/tests/typecheck/should_fail/T3592.hs | 0
testsuite/tests/typecheck/should_fail/T3613.hs | 0
testsuite/tests/typecheck/should_fail/T3950.hs | 0
testsuite/tests/typecheck/should_fail/T4875.hs | 0
testsuite/tests/typecheck/should_fail/T5246.hs | 0
testsuite/tests/typecheck/should_fail/T5689.hs | 0
testsuite/tests/typecheck/should_fail/T5978.hs | 0
testsuite/tests/typecheck/should_fail/T6022.hs | 0
testsuite/tests/typecheck/should_fail/T7892.hs | 0
testsuite/tests/typecheck/should_fail/fd-loop.hs | 0
testsuite/tests/typecheck/should_fail/tcfail136.hs | 0
testsuite/tests/typecheck/should_fail/tcfail140.hs | 0
testsuite/tests/typecheck/should_fail/tcfail146.hs | 0
testsuite/tests/typecheck/should_fail/tcfail147.hs | 0
testsuite/tests/typecheck/should_fail/tcfail189.hs | 0
testsuite/tests/typecheck/should_fail/tcfail193.hs | 0
59 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/testsuite/tests/simplCore/should_compile/rule1.hs b/testsuite/tests/simplCore/should_compile/rule1.hs
index 923f480..6894f82 100644
--- a/testsuite/tests/simplCore/should_compile/rule1.hs
+++ b/testsuite/tests/simplCore/should_compile/rule1.hs
@@ -1,9 +1,9 @@
-- This one triggers the bug reported in Trac #1092
-- The problem is that the rule
--- forall w. f (\v->w) = w
+-- forall w. f (\v->w) = w
-- erroneously matches the call
--- f id
+-- f id
--
-- Lint catches the error
diff --git a/testsuite/tests/th/T2597a_Lib.hs b/testsuite/tests/th/T2597a_Lib.hs
index 0e8f794..ad69ac2 100644
--- a/testsuite/tests/th/T2597a_Lib.hs
+++ b/testsuite/tests/th/T2597a_Lib.hs
@@ -7,6 +7,6 @@ import Language.Haskell.TH
mkBug :: ExpQ
mkBug = return $ CompE [BindS (VarP $ mkName "p") (ListE []), NoBindS
- (VarE $ mkName "p")]
+ (VarE $ mkName "p")]
diff --git a/testsuite/tests/th/TH_1tuple.hs b/testsuite/tests/th/TH_1tuple.hs
index 3674a5a..ea1a119 100644
--- a/testsuite/tests/th/TH_1tuple.hs
+++ b/testsuite/tests/th/TH_1tuple.hs
@@ -6,10 +6,10 @@ module ShouldFail where
import Language.Haskell.TH
x = $(sigE [|1|] (tupleT 1 `appT` conT ''Int))
- -- 1 :: (Int) ( a 1-tuple type)
+ -- 1 :: (Int) ( a 1-tuple type)
y = $(sigE [|1|] (tupleT 1))
- -- 1 :: (1) (a 1-tuple tycon not applied)
+ -- 1 :: (1) (a 1-tuple tycon not applied)
z = $(tupE [ [| "yes" |] ])
- -- ("yes") (a 1-tuple expression)
+ -- ("yes") (a 1-tuple expression)
diff --git a/testsuite/tests/typecheck/should_compile/faxen.hs b/testsuite/tests/typecheck/should_compile/faxen.hs
index 8ad56c6..3dd9f7b 100644
--- a/testsuite/tests/typecheck/should_compile/faxen.hs
+++ b/testsuite/tests/typecheck/should_compile/faxen.hs
@@ -22,12 +22,12 @@ instance HasEmpty (Maybe a) where
test1 y
= (null y)
|| (let f :: forall d. d -> Bool
- f x = isEmpty (y >> return x)
+ f x = isEmpty (y >> return x)
in f y)
test2 y
= (let f :: forall d. d -> Bool
- f x = isEmpty (y >> return x)
+ f x = isEmpty (y >> return x)
in f y)
|| (null y)
More information about the ghc-commits
mailing list