Distinguish between UnitId and InstalledUnitId.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

17 files changed, 52 insertions, 44 deletions

diff --git a/testsuite/tests/backpack/cabal/bkpcabal01/.gitignore b/testsuite/tests/backpack/cabal/bkpcabal01/.gitignore
new file mode 100644
index 0000000000..1c08f2f992
--- /dev/null
+++ b/testsuite/tests/backpack/cabal/bkpcabal01/.gitignore
@@ -0,0 +1,2 @@
+p/P.hs
+q/Q.hs
diff --git a/testsuite/tests/cabal/cabal05/cabal05.stderr b/testsuite/tests/cabal/cabal05/cabal05.stderr
index b38f3a5301..eb51115ab0 100644
--- a/testsuite/tests/cabal/cabal05/cabal05.stderr
+++ b/testsuite/tests/cabal/cabal05/cabal05.stderr
@@ -1,5 +1,5 @@
 
 T.hs:3:1: error:
-    Ambiguous interface for ‘Conflict’:
+    Ambiguous module name ‘Conflict’:
       it is bound as p-0.1.0.0:P2 by a reexport in package p-0.1.0.0
       it is bound as P by a reexport in package p-0.1.0.0
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index d7b35b7f88..7077b3507b 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -16,6 +16,7 @@ description:
 category: none
 author: simonmar@microsoft.com
 exposed: True
+indefinite: False
 exposed-modules:
     A
 hidden-modules: B C.D
@@ -42,6 +43,7 @@ description:
 category: none
 author: simonmar@microsoft.com
 exposed: True
+indefinite: False
 exposed-modules:
     A
 hidden-modules: B C.D
@@ -74,6 +76,7 @@ description:
 category: none
 author: simonmar@microsoft.com
 exposed: False
+indefinite: False
 exposed-modules:
     A
 hidden-modules: B C.D C.E
@@ -100,6 +103,7 @@ description:
 category: none
 author: simonmar@microsoft.com
 exposed: False
+indefinite: False
 exposed-modules:
     A
 hidden-modules: B C.D C.E
@@ -126,6 +130,7 @@ description:
 category: none
 author: simonmar@microsoft.com
 exposed: True
+indefinite: False
 exposed-modules:
     A
 hidden-modules: B C.D
@@ -159,6 +164,7 @@ description:
 category: none
 author: simonmar@microsoft.com
 exposed: False
+indefinite: False
 exposed-modules:
     A
 hidden-modules: B C.D
diff --git a/testsuite/tests/cabal/ghcpkg04.stderr b/testsuite/tests/cabal/ghcpkg04.stderr
index b601f3e706..5cc97f573f 100644
--- a/testsuite/tests/cabal/ghcpkg04.stderr
+++ b/testsuite/tests/cabal/ghcpkg04.stderr
@@ -1,4 +1,4 @@
 
 ghcpkg04.hs:1:1: error:
-    Ambiguous interface for ‘A’:
-      it was found in multiple packages: testpkg-1.2.3.4 newtestpkg-2.0
+    Ambiguous module name ‘A’:
+      it was found in multiple packages: newtestpkg-2.0 testpkg-1.2.3.4
diff --git a/testsuite/tests/driver/driver063.stderr b/testsuite/tests/driver/driver063.stderr
index 84ff5b6dbb..307467b27b 100644
--- a/testsuite/tests/driver/driver063.stderr
+++ b/testsuite/tests/driver/driver063.stderr
@@ -1,4 +1,4 @@
 
 D063.hs:2:1: error:
-    Failed to load interface for ‘A063’
+    Could not find module ‘A063’
     It is not a module in the current program, or in any known package.
diff --git a/testsuite/tests/ghc-e/should_run/T2636.stderr b/testsuite/tests/ghc-e/should_run/T2636.stderr
index 1a7912735c..bf73e40e77 100644
--- a/testsuite/tests/ghc-e/should_run/T2636.stderr
+++ b/testsuite/tests/ghc-e/should_run/T2636.stderr
@@ -1,4 +1,4 @@
 
 T2636.hs:1:1: error:
-    Failed to load interface for ‘MissingModule’
+    Could not find module ‘MissingModule’
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/module/mod1.stderr b/testsuite/tests/module/mod1.stderr
index ecc147513d..50554ae4c6 100644
--- a/testsuite/tests/module/mod1.stderr
+++ b/testsuite/tests/module/mod1.stderr
@@ -1,4 +1,4 @@
 
-mod1.hs:3:1:
-    Failed to load interface for ‘N’
+mod1.hs:3:1: error:
+    Could not find module ‘N’
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/module/mod2.stderr b/testsuite/tests/module/mod2.stderr
index 32522890ba..a070917fc4 100644
--- a/testsuite/tests/module/mod2.stderr
+++ b/testsuite/tests/module/mod2.stderr
@@ -1,4 +1,4 @@
 
-mod2.hs:3:1:
-    Failed to load interface for ‘N’
+mod2.hs:3:1: error:
+    Could not find module ‘N’
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index ea5f2f6975..f34ee1dd8f 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,10 +1,10 @@
 
 package01e.hs:2:1: error:
-    Failed to load interface for ‘Data.Map’
+    Could not find module ‘Data.Map’
     It is a member of the hidden package ‘containers-0.5.7.1’.
     Use -v to see a list of the files searched for.
 
 package01e.hs:3:1: error:
-    Failed to load interface for ‘Data.IntMap’
+    Could not find module ‘Data.IntMap’
     It is a member of the hidden package ‘containers-0.5.7.1’.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/package/package06e.stderr b/testsuite/tests/package/package06e.stderr
index 1cb27e342c..c634d2d46c 100644
--- a/testsuite/tests/package/package06e.stderr
+++ b/testsuite/tests/package/package06e.stderr
@@ -1,10 +1,10 @@
 
-package06e.hs:2:1:
-    Failed to load interface for ‘HsTypes’
-    It is a member of the hidden package ‘ghc-<VERSION>’.
+package06e.hs:2:1: error:
+    Could not find module ‘HsTypes’
+    It is a member of the hidden package ‘ghc-8.1’.
     Use -v to see a list of the files searched for.
 
-package06e.hs:3:1:
-    Failed to load interface for ‘UniqFM’
-    It is a member of the hidden package ‘ghc-<VERSION>’.
+package06e.hs:3:1: error:
+    Could not find module ‘UniqFM’
+    It is a member of the hidden package ‘ghc-8.1’.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/package/package07e.stderr b/testsuite/tests/package/package07e.stderr
index 8de07f99b2..a446a47247 100644
--- a/testsuite/tests/package/package07e.stderr
+++ b/testsuite/tests/package/package07e.stderr
@@ -1,16 +1,16 @@
 
 package07e.hs:2:1: error:
-    Failed to load interface for ‘MyHsTypes’
+    Could not find module ‘MyHsTypes’
     Use -v to see a list of the files searched for.
 
 package07e.hs:3:1: error:
-    Failed to load interface for ‘HsTypes’
+    Could not find module ‘HsTypes’
     Use -v to see a list of the files searched for.
 
 package07e.hs:4:1: error:
-    Failed to load interface for ‘HsUtils’
+    Could not find module ‘HsUtils’
     Use -v to see a list of the files searched for.
 
 package07e.hs:5:1: error:
-    Failed to load interface for ‘UniqFM’
+    Could not find module ‘UniqFM’
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/package/package08e.stderr b/testsuite/tests/package/package08e.stderr
index c5017350f0..3d8d2321b7 100644
--- a/testsuite/tests/package/package08e.stderr
+++ b/testsuite/tests/package/package08e.stderr
@@ -1,16 +1,16 @@
 
 package08e.hs:2:1: error:
-    Failed to load interface for ‘MyHsTypes’
+    Could not find module ‘MyHsTypes’
     Use -v to see a list of the files searched for.
 
 package08e.hs:3:1: error:
-    Failed to load interface for ‘HsTypes’
+    Could not find module ‘HsTypes’
     Use -v to see a list of the files searched for.
 
 package08e.hs:4:1: error:
-    Failed to load interface for ‘HsUtils’
+    Could not find module ‘HsUtils’
     Use -v to see a list of the files searched for.
 
 package08e.hs:5:1: error:
-    Failed to load interface for ‘UniqFM’
+    Could not find module ‘UniqFM’
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/package/package09e.stderr b/testsuite/tests/package/package09e.stderr
index 9cd00a2930..3ce28df519 100644
--- a/testsuite/tests/package/package09e.stderr
+++ b/testsuite/tests/package/package09e.stderr
@@ -1,5 +1,5 @@
 
-package09e.hs:2:1:
-    Ambiguous interface for ‘M’:
+package09e.hs:2:1: error:
+    Ambiguous module name ‘M’:
       it is bound as Data.Set by a package flag
       it is bound as Data.Map by a package flag
diff --git a/testsuite/tests/perf/compiler/parsing001.stderr b/testsuite/tests/perf/compiler/parsing001.stderr
index 0f86f7f994..d24d77539b 100644
--- a/testsuite/tests/perf/compiler/parsing001.stderr
+++ b/testsuite/tests/perf/compiler/parsing001.stderr
@@ -1,4 +1,4 @@
 
-parsing001.hs:3:1:
-    Failed to load interface for ‘Wibble’
+parsing001.hs:3:1: error:
+    Could not find module ‘Wibble’
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
index 276c723203..d32906e4e5 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
@@ -1,7 +1,7 @@
 
-SafeLang07.hs:2:14: Warning:
+SafeLang07.hs:2:14: warning:
     -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving
 
-SafeLang07.hs:15:1:
-    Failed to load interface for ‘SafeLang07_A’
+SafeLang07.hs:15:1: error:
+    Could not find module ‘SafeLang07_A’
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/th/T10279.stderr b/testsuite/tests/th/T10279.stderr
index 21688ae836..0d23a80877 100644
--- a/testsuite/tests/th/T10279.stderr
+++ b/testsuite/tests/th/T10279.stderr
@@ -1,8 +1,8 @@
 
 T10279.hs:10:10: error:
-    Failed to load interface for ‘A’
-    no unit id matching ‘rts-1.0’ was found
-    (This unit ID looks like the source package ID;
-     the real unit ID is ‘rts’)
-    In the expression: (rts-1.0:A.Foo)
-    In an equation for ‘blah’: blah = (rts-1.0:A.Foo)
+    • Failed to load interface for ‘A’
+      no unit id matching ‘rts-1.0’ was found
+      (This unit ID looks like the source package ID;
+       the real unit ID is ‘rts’)
+    • In the expression: (rts-1.0:A.Foo)
+      In an equation for ‘blah’: blah = (rts-1.0:A.Foo)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail082.stderr b/testsuite/tests/typecheck/should_fail/tcfail082.stderr
index 4e3d6ce996..841b5c82f6 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail082.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail082.stderr
@@ -1,12 +1,12 @@
 
-tcfail082.hs:2:1:
-    Failed to load interface for ‘Data82’
+tcfail082.hs:2:1: error:
+    Could not find module ‘Data82’
     Use -v to see a list of the files searched for.
 
-tcfail082.hs:3:1:
-    Failed to load interface for ‘Inst82_1’
+tcfail082.hs:3:1: error:
+    Could not find module ‘Inst82_1’
     Use -v to see a list of the files searched for.
 
-tcfail082.hs:4:1:
-    Failed to load interface for ‘Inst82_2’
+tcfail082.hs:4:1: error:
+    Could not find module ‘Inst82_2’
     Use -v to see a list of the files searched for.