Revert "Make the Ord Module independent of Unique order"

This reverts commit 0497ee504cc9ac5d6babee9b98bf779b3fc50b98.

Reason: See Trac #12191.  I'm reverting pending Bartosz's
investigation of what went wrong.

6 files changed, 33 insertions, 33 deletions

diff --git a/testsuite/tests/driver/sigof01/all.T b/testsuite/tests/driver/sigof01/all.T
index 61a012d264..077263a17f 100644
--- a/testsuite/tests/driver/sigof01/all.T
+++ b/testsuite/tests/driver/sigof01/all.T
@@ -4,6 +4,6 @@ test('sigof01',
      ['$MAKE -s --no-print-directory sigof01'])
 
 test('sigof01m',
-     [ expect_broken(12189), clean_cmd('rm -rf tmp_sigof01m'), normalise_slashes ],
+     [ clean_cmd('rm -rf tmp_sigof01m'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory sigof01m'])
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr
index 9be384b500..9d8e8bd6c3 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr
@@ -1,6 +1,6 @@
 [1 of 4] Compiling OverloadedRecFldsFail10_A ( OverloadedRecFldsFail10_A.hs, OverloadedRecFldsFail10_A.o )
-[2 of 4] Compiling OverloadedRecFldsFail10_B ( OverloadedRecFldsFail10_B.hs, OverloadedRecFldsFail10_B.o )
-[3 of 4] Compiling OverloadedRecFldsFail10_C ( OverloadedRecFldsFail10_C.hs, OverloadedRecFldsFail10_C.o )
+[2 of 4] Compiling OverloadedRecFldsFail10_C ( OverloadedRecFldsFail10_C.hs, OverloadedRecFldsFail10_C.o )
+[3 of 4] Compiling OverloadedRecFldsFail10_B ( OverloadedRecFldsFail10_B.hs, OverloadedRecFldsFail10_B.o )
 [4 of 4] Compiling Main             ( overloadedrecfldsfail10.hs, overloadedrecfldsfail10.o )
 
 overloadedrecfldsfail10.hs:6:20: error:
diff --git a/testsuite/tests/rename/should_fail/T11071.stderr b/testsuite/tests/rename/should_fail/T11071.stderr
index 0e77fae7de..2feeadd040 100644
--- a/testsuite/tests/rename/should_fail/T11071.stderr
+++ b/testsuite/tests/rename/should_fail/T11071.stderr
@@ -13,7 +13,7 @@ T11071.hs:21:12: error:
 
 T11071.hs:22:12: error:
     Not in scope: ‘M'.foobar’
-    Neither ‘System.IO’, ‘Data.IntMap’ nor ‘Data.Map’ exports ‘foobar’.
+    Neither ‘Data.IntMap’, ‘Data.Map’ nor ‘System.IO’ exports ‘foobar’.
 
 T11071.hs:23:12: error:
     Not in scope: ‘Data.List.sort’
diff --git a/testsuite/tests/rename/should_fail/T11071a.stderr b/testsuite/tests/rename/should_fail/T11071a.stderr
index 853a79d3d7..9db69ae578 100644
--- a/testsuite/tests/rename/should_fail/T11071a.stderr
+++ b/testsuite/tests/rename/should_fail/T11071a.stderr
@@ -1,26 +1,26 @@
 
 T11071a.hs:12:12: error:
-    • Variable not in scope: intersperse
-    • Perhaps you want to add ‘intersperse’ to the import list
-      in the import of ‘Data.List’ (T11071a.hs:3:1-24).
+    Variable not in scope: intersperse
+    Perhaps you want to add ‘intersperse’ to the import list
+    in the import of ‘Data.List’ (T11071a.hs:3:1-24).
 
 T11071a.hs:13:12: error:
-    • Variable not in scope: foldl'
-    • Perhaps you meant one of these:
-        ‘foldl’ (imported from Prelude), ‘foldl1’ (imported from Prelude),
-        ‘foldr’ (imported from Prelude)
-      Perhaps you want to add ‘foldl'’ to one of these import lists:
-        ‘Data.List’ (T11071a.hs:3:1-24)
-        ‘Data.IntMap’ (T11071a.hs:4:1-21)
+    Variable not in scope: foldl'
+    Perhaps you meant one of these:
+      ‘foldl’ (imported from Prelude), ‘foldl1’ (imported from Prelude),
+      ‘foldr’ (imported from Prelude)
+    Perhaps you want to add ‘foldl'’ to one of these import lists:
+      ‘Data.IntMap’ (T11071a.hs:4:1-21)
+      ‘Data.List’ (T11071a.hs:3:1-24)
 
 T11071a.hs:14:12: error:
-    • Data constructor not in scope: Down
-    • Perhaps you want to remove ‘Down’ from the explicit hiding list
-      in the import of ‘Data.Ord’ (T11071a.hs:5:1-29).
+    Data constructor not in scope: Down
+    Perhaps you want to remove ‘Down’ from the explicit hiding list
+    in the import of ‘Data.Ord’ (T11071a.hs:5:1-29).
 
 T11071a.hs:15:12: error:
-    • Data constructor not in scope: True
-    • Perhaps you want to remove ‘True’ from the explicit hiding list
-      in the import of ‘Prelude’ (T11071a.hs:6:1-28).
+    Data constructor not in scope: True
+    Perhaps you want to remove ‘True’ from the explicit hiding list
+    in the import of ‘Prelude’ (T11071a.hs:6:1-28).
 
 T11071a.hs:16:12: error: Variable not in scope: foobar
diff --git a/testsuite/tests/typecheck/should_fail/T6018fail.stderr b/testsuite/tests/typecheck/should_fail/T6018fail.stderr
index e5bf51cf09..3bd6b40a82 100644
--- a/testsuite/tests/typecheck/should_fail/T6018fail.stderr
+++ b/testsuite/tests/typecheck/should_fail/T6018fail.stderr
@@ -1,6 +1,6 @@
 [1 of 5] Compiling T6018Bfail       ( T6018Bfail.hs, T6018Bfail.o )
-[2 of 5] Compiling T6018Cfail       ( T6018Cfail.hs, T6018Cfail.o )
-[3 of 5] Compiling T6018Dfail       ( T6018Dfail.hs, T6018Dfail.o )
+[2 of 5] Compiling T6018Dfail       ( T6018Dfail.hs, T6018Dfail.o )
+[3 of 5] Compiling T6018Cfail       ( T6018Cfail.hs, T6018Cfail.o )
 [4 of 5] Compiling T6018Afail       ( T6018Afail.hs, T6018Afail.o )
 [5 of 5] Compiling T6018fail        ( T6018fail.hs, T6018fail.o )
 
diff --git a/testsuite/tests/typecheck/should_run/T7861.stderr b/testsuite/tests/typecheck/should_run/T7861.stderr
index e9ee5e91a7..e0aac9a558 100644
--- a/testsuite/tests/typecheck/should_run/T7861.stderr
+++ b/testsuite/tests/typecheck/should_run/T7861.stderr
@@ -1,13 +1,13 @@
 T7861: T7861.hs:10:5: error:
-    • Couldn't match type ‘a’ with ‘[a]’
-      ‘a’ is a rigid type variable bound by
-        the type signature for:
-          f :: forall a. (forall b. a) -> a
-        at T7861.hs:9:1-23
-      Expected type: (forall b. a) -> a
-        Actual type: (forall b. a) -> [a]
-    • In the expression: doA
-      In an equation for ‘f’: f = doA
-    • Relevant bindings include
-        f :: (forall b. a) -> a (bound at T7861.hs:10:1)
+    Couldn't match type ‘a’ with ‘[a]’
+    ‘a’ is a rigid type variable bound by
+      the type signature for:
+        f :: forall a. (forall b. a) -> a
+      at T7861.hs:9:6
+    Expected type: (forall b. a) -> a
+      Actual type: (forall b. a) -> [a]
+    In the expression: doA
+    In an equation for ‘f’: f = doA
+    Relevant bindings include
+      f :: (forall b. a) -> a (bound at T7861.hs:10:1)
 (deferred type error)