summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/main/Finder.hs37
-rw-r--r--testsuite/tests/ghc-e/should_run/T2636.stderr2
-rw-r--r--testsuite/tests/module/mod1.stderr2
-rw-r--r--testsuite/tests/module/mod2.stderr2
-rw-r--r--testsuite/tests/package/T4806.stderr4
-rw-r--r--testsuite/tests/package/T4806a.stderr4
-rw-r--r--testsuite/tests/package/package01e.stderr8
-rw-r--r--testsuite/tests/package/package06e.stderr8
-rw-r--r--testsuite/tests/package/package07e.stderr16
-rw-r--r--testsuite/tests/package/package08e.stderr16
-rw-r--r--testsuite/tests/perf/compiler/parsing001.stderr2
-rw-r--r--testsuite/tests/plugins/T11244.stderr2
-rw-r--r--testsuite/tests/plugins/plugins03.stderr2
-rw-r--r--testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail082.stderr6
15 files changed, 54 insertions, 59 deletions
diff --git a/compiler/main/Finder.hs b/compiler/main/Finder.hs
index 40efcf3523..9a3cb6009b 100644
--- a/compiler/main/Finder.hs
+++ b/compiler/main/Finder.hs
@@ -652,7 +652,7 @@ cantFindErr cannot_find _ dflags mod_name find_result
-> not_found_in_package pkg files
| not (null suggest)
- -> pp_suggestions suggest $$ tried_these files
+ -> pp_suggestions suggest $$ tried_these files dflags
| null files && null mod_hiddens &&
null pkg_hiddens && null unusables
@@ -662,7 +662,7 @@ cantFindErr cannot_find _ dflags mod_name find_result
-> vcat (map pkg_hidden pkg_hiddens) $$
vcat (map mod_hidden mod_hiddens) $$
vcat (map unusable unusables) $$
- tried_these files
+ tried_these files dflags
_ -> panic "cantFindErr"
@@ -676,20 +676,13 @@ cantFindErr cannot_find _ dflags mod_name find_result
in
text "Perhaps you haven't installed the " <> text build <>
text " libraries for package " <> quotes (ppr pkg) <> char '?' $$
- tried_these files
+ tried_these files dflags
| otherwise
= text "There are files missing in the " <> quotes (ppr pkg) <>
text " package," $$
text "try running 'ghc-pkg check'." $$
- tried_these files
-
- tried_these files
- | null files = Outputable.empty
- | verbosity dflags < 3 =
- text "Use -v to see a list of the files searched for."
- | otherwise =
- hang (text "Locations searched:") 2 $ vcat (map text files)
+ tried_these files dflags
pkg_hidden :: UnitId -> SDoc
pkg_hidden pkgid =
@@ -778,7 +771,7 @@ cantFindInstalledErr cannot_find _ dflags mod_name find_result
-> text "It is not a module in the current program, or in any known package."
| otherwise
- -> tried_these files
+ -> tried_these files dflags
_ -> panic "cantFindInstalledErr"
@@ -804,17 +797,19 @@ cantFindInstalledErr cannot_find _ dflags mod_name find_result
in
text "Perhaps you haven't installed the " <> text build <>
text " libraries for package " <> quotes (ppr pkg) <> char '?' $$
- tried_these files
+ tried_these files dflags
| otherwise
= text "There are files missing in the " <> quotes (ppr pkg) <>
text " package," $$
text "try running 'ghc-pkg check'." $$
- tried_these files
-
- tried_these files
- | null files = Outputable.empty
- | verbosity dflags < 3 =
- text "Use -v to see a list of the files searched for."
- | otherwise =
- hang (text "Locations searched:") 2 $ vcat (map text files)
+ tried_these files dflags
+
+tried_these :: [FilePath] -> DynFlags -> SDoc
+tried_these files dflags
+ | null files = Outputable.empty
+ | verbosity dflags < 3 =
+ text "Use -v (or `:set -v` in ghci) " <>
+ text "to see a list of the files searched for."
+ | otherwise =
+ hang (text "Locations searched:") 2 $ vcat (map text files)
diff --git a/testsuite/tests/ghc-e/should_run/T2636.stderr b/testsuite/tests/ghc-e/should_run/T2636.stderr
index bf73e40e77..9a2c6674c9 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:
Could not find module ‘MissingModule’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/module/mod1.stderr b/testsuite/tests/module/mod1.stderr
index 50554ae4c6..9bcff0bc5d 100644
--- a/testsuite/tests/module/mod1.stderr
+++ b/testsuite/tests/module/mod1.stderr
@@ -1,4 +1,4 @@
mod1.hs:3:1: error:
Could not find module ‘N’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/module/mod2.stderr b/testsuite/tests/module/mod2.stderr
index a070917fc4..d9d07168b7 100644
--- a/testsuite/tests/module/mod2.stderr
+++ b/testsuite/tests/module/mod2.stderr
@@ -1,4 +1,4 @@
mod2.hs:3:1: error:
Could not find module ‘N’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/T4806.stderr b/testsuite/tests/package/T4806.stderr
index 6b332fd32b..99bde2ec0d 100644
--- a/testsuite/tests/package/T4806.stderr
+++ b/testsuite/tests/package/T4806.stderr
@@ -1,6 +1,6 @@
T4806.hs:1:1: error:
Could not load module ‘Data.Map’
- It is a member of the package ‘containers-0.5.11.0’
+ It is a member of the package ‘containers-0.6.0.1’
which is ignored due to an -ignore-package flag
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/T4806a.stderr b/testsuite/tests/package/T4806a.stderr
index 36cbb59fbe..3d768a64b6 100644
--- a/testsuite/tests/package/T4806a.stderr
+++ b/testsuite/tests/package/T4806a.stderr
@@ -1,7 +1,7 @@
T4806a.hs:1:1: error:
Could not load module ‘Data.Map’
- It is a member of the package ‘containers-0.5.11.0’
+ It is a member of the package ‘containers-0.6.0.1’
which is unusable because the -ignore-package flag was used to ignore at least one of its dependencies:
deepseq-1.4.4.0
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index 7ae545fe6f..3381a1bd42 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,14 +1,14 @@
package01e.hs:2:1: error:
Could not load module ‘Data.Map’
- It is a member of the hidden package ‘containers-0.5.11.0’.
+ It is a member of the hidden package ‘containers-0.6.0.1’.
You can run ‘:set -package containers’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package01e.hs:3:1: error:
Could not load module ‘Data.IntMap’
- It is a member of the hidden package ‘containers-0.5.11.0’.
+ It is a member of the hidden package ‘containers-0.6.0.1’.
You can run ‘:set -package containers’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package06e.stderr b/testsuite/tests/package/package06e.stderr
index 40673b844c..12d721223c 100644
--- a/testsuite/tests/package/package06e.stderr
+++ b/testsuite/tests/package/package06e.stderr
@@ -1,14 +1,14 @@
package06e.hs:2:1: error:
Could not load module ‘HsTypes’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package06e.hs:3:1: error:
Could not load module ‘UniqFM’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package07e.stderr b/testsuite/tests/package/package07e.stderr
index 132268cb64..2678972a78 100644
--- a/testsuite/tests/package/package07e.stderr
+++ b/testsuite/tests/package/package07e.stderr
@@ -1,26 +1,26 @@
package07e.hs:2:1: error:
Could not find module ‘MyHsTypes’
- Perhaps you meant HsTypes (needs flag -package-key ghc-8.5)
- Use -v to see a list of the files searched for.
+ Perhaps you meant HsTypes (needs flag -package-key ghc-8.7)
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package07e.hs:3:1: error:
Could not load module ‘HsTypes’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package07e.hs:4:1: error:
Could not load module ‘HsUtils’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package07e.hs:5:1: error:
Could not load module ‘UniqFM’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package08e.stderr b/testsuite/tests/package/package08e.stderr
index 31b6e762e7..f02e9d6da3 100644
--- a/testsuite/tests/package/package08e.stderr
+++ b/testsuite/tests/package/package08e.stderr
@@ -1,26 +1,26 @@
package08e.hs:2:1: error:
Could not find module ‘MyHsTypes’
- Perhaps you meant HsTypes (needs flag -package-key ghc-8.5)
- Use -v to see a list of the files searched for.
+ Perhaps you meant HsTypes (needs flag -package-key ghc-8.7)
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package08e.hs:3:1: error:
Could not load module ‘HsTypes’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package08e.hs:4:1: error:
Could not load module ‘HsUtils’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package08e.hs:5:1: error:
Could not load module ‘UniqFM’
- It is a member of the hidden package ‘ghc-8.5’.
+ It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/perf/compiler/parsing001.stderr b/testsuite/tests/perf/compiler/parsing001.stderr
index d24d77539b..8293a1acd1 100644
--- a/testsuite/tests/perf/compiler/parsing001.stderr
+++ b/testsuite/tests/perf/compiler/parsing001.stderr
@@ -1,4 +1,4 @@
parsing001.hs:3:1: error:
Could not find module ‘Wibble’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/plugins/T11244.stderr b/testsuite/tests/plugins/T11244.stderr
index 0c3b3cf781..72f01060db 100644
--- a/testsuite/tests/plugins/T11244.stderr
+++ b/testsuite/tests/plugins/T11244.stderr
@@ -2,4 +2,4 @@
It is a member of the hidden package ‘rule-defining-plugin-0.1’.
You can run ‘:set -package rule-defining-plugin’ to expose it.
(Note: this unloads all the modules in the current scope.)
-Use -v to see a list of the files searched for.
+Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/plugins/plugins03.stderr b/testsuite/tests/plugins/plugins03.stderr
index c02965ad1f..a923550592 100644
--- a/testsuite/tests/plugins/plugins03.stderr
+++ b/testsuite/tests/plugins/plugins03.stderr
@@ -1,2 +1,2 @@
<command line>: Could not find module ‘Simple.NonExistentPlugin’
-Use -v to see a list of the files searched for.
+Use -v (or `:set -v` in ghci) 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 d32906e4e5..acfb8de460 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
@@ -4,4 +4,4 @@ SafeLang07.hs:2:14: warning:
SafeLang07.hs:15:1: error:
Could not find module ‘SafeLang07_A’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/typecheck/should_fail/tcfail082.stderr b/testsuite/tests/typecheck/should_fail/tcfail082.stderr
index 841b5c82f6..31317b2c42 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: error:
Could not find module ‘Data82’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
tcfail082.hs:3:1: error:
Could not find module ‘Inst82_1’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
tcfail082.hs:4:1: error:
Could not find module ‘Inst82_2’
- Use -v to see a list of the files searched for.
+ Use -v (or `:set -v` in ghci) to see a list of the files searched for.
View Lorry Controller Status