[commit: ghc] master: make accept for Make simplifyInstanceContexts deterministic (ab91b85)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ab91b851637437844359bc6e82efff44dfb0c0ea/ghc

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

commit ab91b851637437844359bc6e82efff44dfb0c0ea
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Tue May 10 07:56:06 2016 -0700

    make accept for Make simplifyInstanceContexts deterministic
    
    Making it deterministic changed some error messages and I
    forgot to make accept. Relevant change: b58b0e18a568.


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

ab91b851637437844359bc6e82efff44dfb0c0ea
 testsuite/tests/ghci.debugger/scripts/break006.stderr  | 4 ++--
 testsuite/tests/typecheck/should_fail/T5095.stderr     | 2 +-
 testsuite/tests/typecheck/should_fail/tcfail133.stderr | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr
index 2b43dff..463b66f 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr
@@ -5,7 +5,7 @@
       Use :print or :force to determine these types
       Relevant bindings include it :: t (bound at <interactive>:4:1)
       These potential instances exist:
-        instance (Show a, Show b) => Show (Either a b)
+        instance (Show b, Show a) => Show (Either a b)
           -- Defined in ‘Data.Either’
         instance Show Ordering -- Defined in ‘GHC.Show’
         instance Show Integer -- Defined in ‘GHC.Show’
@@ -20,7 +20,7 @@
       Use :print or :force to determine these types
       Relevant bindings include it :: t (bound at <interactive>:6:1)
       These potential instances exist:
-        instance (Show a, Show b) => Show (Either a b)
+        instance (Show b, Show a) => Show (Either a b)
           -- Defined in ‘Data.Either’
         instance Show Ordering -- Defined in ‘GHC.Show’
         instance Show Integer -- Defined in ‘GHC.Show’
diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr
index dcde111..dc10d40 100644
--- a/testsuite/tests/typecheck/should_fail/T5095.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5095.stderr
@@ -3,7 +3,7 @@ T5095.hs:9:9: error:
     • Overlapping instances for Eq a arising from a use of ‘==’
       Matching instances:
         instance [overlappable] Show a => Eq a -- Defined at T5095.hs:5:31
-        instance (Eq a, Eq b) => Eq (Either a b)
+        instance (Eq b, Eq a) => Eq (Either a b)
           -- Defined in ‘Data.Either’
         instance Eq Ordering -- Defined in ‘GHC.Classes’
         ...plus 24 others
diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
index 72dc14e..a2b602c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
@@ -9,7 +9,7 @@ tcfail133.hs:68:7: error:
       These potential instances exist:
         instance Show Ordering -- Defined in ‘GHC.Show’
         instance Show Integer -- Defined in ‘GHC.Show’
-        instance (Show a, Show b, Number a, Digit b) => Show (a :@ b)
+        instance (Show b, Show a, Digit b, Number a) => Show (a :@ b)
           -- Defined at tcfail133.hs:11:54
         ...plus 25 others
         ...plus five instances involving out-of-scope types