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.

2 files changed, 17 insertions, 17 deletions

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