[commit: testsuite] no-pred-ty: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/testsuite into no-pred-ty (ae349f9)

[Max Bolingbroke]

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

On branch  : no-pred-ty

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

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

commit ae349f97af81dfed925a08b97b8166f19c20bb88
Merge: b4e233b... 1461942...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Wed Aug 31 22:19:43 2011 +0100

    Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/testsuite into no-pred-ty

 tests/codeGen/should_run/cgrun071.hs               |   22 +++++++++++------
 tests/codeGen/should_run/cgrun071.stdout           |   10 ++++----
 tests/dph/diophantine/DiophantineVect.hs           |    5 ++-
 tests/dph/diophantine/Main.hs                      |    4 +-
 tests/dph/diophantine/dph-diophantine-fast.stdout  |    6 ++--
 tests/dph/diophantine/dph-diophantine-opt.stdout   |    6 ++--
 tests/dph/diophantine/dph-diophantine.T            |    1 -
 tests/ghci/scripts/T5417.hs                        |   10 ++++++++
 tests/ghci/scripts/T5417.script                    |    3 ++
 tests/ghci/scripts/T5417.stdout                    |    8 ++++++
 tests/ghci/scripts/T5417a.hs                       |    5 ++++
 tests/ghci/scripts/all.T                           |    1 +
 tests/ghci/scripts/ghci011.stdout                  |    2 +-
 tests/ghci/scripts/ghci036.stderr                  |    4 ---
 tests/ghci/scripts/ghci036.stdout                  |    1 +
 tests/haddock/haddock_examples/haddock.Test.stderr |   24 ++++++++++---------
 tests/indexed-types/should_compile/T3017.stderr    |    2 +-
 tests/indexed-types/should_fail/NoMatchErr.stderr  |   10 ++++----
 tests/indexed-types/should_fail/T1897b.stderr      |    2 +-
 tests/indexed-types/should_fail/T2544.stderr       |   10 ++++----
 tests/indexed-types/should_fail/T2627b.stderr      |    2 +-
 tests/indexed-types/should_fail/T2693.stderr       |    2 +-
 tests/indexed-types/should_fail/T4099.stderr       |    2 +-
 tests/simplCore/should_compile/T3772.stdout        |    4 +-
 tests/th/T1835.hs                                  |   18 +++++++-------
 tests/th/T3319.stderr                              |    2 +-
 tests/th/T5362.stderr                              |    4 +-
 tests/th/TH_foreignInterruptible.stderr            |    2 +-
 28 files changed, 102 insertions(+), 70 deletions(-)

diff --cc tests/indexed-types/should_compile/T3017.stderr
index 95f187a,a41b6fe..491b35c
--- a/tests/indexed-types/should_compile/T3017.stderr
+++ b/tests/indexed-types/should_compile/T3017.stderr
@@@ -1,13 -1,9 +1,13 @@@
  TYPE SIGNATURES
      emptyL :: forall a. ListColl a
      test2 :: forall c t t1.
-              (Num t, Num t1, Coll c, Elem c ~ (t, t1)) =>
+              (Num t1, Num t, Coll c, Elem c ~ (t, t1)) =>
               c -> c
  TYPE CONSTRUCTORS
 +  class Coll c
 +      RecFlag NonRecursive
 +      type family Elem c :: *
 +      empty :: c insert :: Elem c -> c -> c
    data ListColl a
        RecFlag NonRecursive
        = L :: forall a. [a] -> ListColl a Stricts: _