[commit: ghc] master: Slightly reword not-exported message. (2f16484)

git at git.haskell.org git at git.haskell.org
Mon Feb 13 04:13:48 UTC 2017


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

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

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

commit 2f164846884610cf78f02771711cd5613839b952
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Feb 10 00:54:55 2017 -0800

    Slightly reword not-exported message.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


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

2f164846884610cf78f02771711cd5613839b952
 compiler/typecheck/TcBackpack.hs                      | 3 ++-
 testsuite/tests/backpack/should_fail/bkpfail01.stderr | 4 ++--
 testsuite/tests/backpack/should_fail/bkpfail05.stderr | 2 +-
 testsuite/tests/backpack/should_fail/bkpfail09.stderr | 4 ++--
 testsuite/tests/backpack/should_fail/bkpfail16.stderr | 2 +-
 testsuite/tests/backpack/should_fail/bkpfail35.stderr | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/compiler/typecheck/TcBackpack.hs b/compiler/typecheck/TcBackpack.hs
index 72cd89b..fe17af5 100644
--- a/compiler/typecheck/TcBackpack.hs
+++ b/compiler/typecheck/TcBackpack.hs
@@ -823,7 +823,8 @@ checkImplements impl_mod req_mod@(IndefModule uid mod_name) =
     forM_ (exportOccs (mi_exports isig_iface)) $ \occ ->
         case lookupGlobalRdrEnv impl_gr occ of
             [] -> addErr $ quotes (ppr occ)
-                    <+> text "is exported by the hsig file, but not exported the module"
+                    <+> text "is exported by the hsig file, but not"
+                    <+> text "exported by the implementing module"
                     <+> quotes (ppr impl_mod)
             _ -> return ()
     failIfErrsM
diff --git a/testsuite/tests/backpack/should_fail/bkpfail01.stderr b/testsuite/tests/backpack/should_fail/bkpfail01.stderr
index 3231922..e88d122 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail01.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail01.stderr
@@ -11,9 +11,9 @@
     [1 of 2] Compiling H[sig]           ( p/H.hsig, nothing )
 
 bkpfail01.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/../H.hi:1:1: error:
-    • ‘H’ is exported by the hsig file, but not exported the module ‘q:H’
+    • ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
     • while checking that q:H implements signature H in p[H=q:H]
 
 bkpfail01.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/../H.hi:1:1: error:
-    • ‘H’ is exported by the hsig file, but not exported the module ‘q:H’
+    • ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
     • while checking that q:H implements signature H in p[H=q:H]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail05.stderr b/testsuite/tests/backpack/should_fail/bkpfail05.stderr
index cb83305..b231bbd 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail05.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail05.stderr
@@ -18,5 +18,5 @@
       [1 of 1] Compiling H[sig]           ( h/H.hsig, bkpfail05.out/h/h-5FYQgnNkfSvBT5yogOxPpf/H.o )
 
 bkpfail05.out/h/h-5FYQgnNkfSvBT5yogOxPpf/../H.hi:1:1: error:
-    • ‘T1’ is exported by the hsig file, but not exported the module ‘h-impl:H’
+    • ‘T1’ is exported by the hsig file, but not exported by the implementing module ‘h-impl:H’
     • while checking that h-impl:H implements signature H in h[H=h-impl:H]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail09.stderr b/testsuite/tests/backpack/should_fail/bkpfail09.stderr
index a767abc..b33c3b4 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail09.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail09.stderr
@@ -7,9 +7,9 @@
 [3 of 3] Processing r
 
 Command line argument: -unit-id p[H=H]:0:0: error:
-    • ‘H’ is exported by the hsig file, but not exported the module ‘q:H’
+    • ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
     • while checking that q:H implements signature H in p[H=q:H]
 
 Command line argument: -unit-id p[H=H]:0:0: error:
-    • ‘H’ is exported by the hsig file, but not exported the module ‘q:H’
+    • ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
     • while checking that q:H implements signature H in p[H=q:H]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail16.stderr b/testsuite/tests/backpack/should_fail/bkpfail16.stderr
index 3b38ea8..bd7c229 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail16.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail16.stderr
@@ -7,5 +7,5 @@
     [1 of 1] Compiling ShouldFail[sig]  ( p/ShouldFail.hsig, bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/ShouldFail.o )
 
 bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/../ShouldFail.hi:1:1: error:
-    • ‘Booly’ is exported by the hsig file, but not exported the module ‘Data.Bool’
+    • ‘Booly’ is exported by the hsig file, but not exported by the implementing module ‘Data.Bool’
     • while checking that Data.Bool implements signature ShouldFail in p[ShouldFail=Data.Bool]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail35.stderr b/testsuite/tests/backpack/should_fail/bkpfail35.stderr
index ceafe14..6b21317 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail35.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail35.stderr
@@ -17,5 +17,5 @@ bkpfail35.bkp:8:18: warning:
     [1 of 1] Compiling A[sig]           ( q/A.hsig, bkpfail35.out/q/q-E72T6bb4XRkIeTPWK2mCKa/A.o )
 
 bkpfail35.out/q/q-E72T6bb4XRkIeTPWK2mCKa/../A.hi:1:1: error:
-    • ‘y’ is exported by the hsig file, but not exported the module ‘aimpl:A’
+    • ‘y’ is exported by the hsig file, but not exported by the implementing module ‘aimpl:A’
     • while checking that aimpl:A implements signature A in q[A=aimpl:A]



More information about the ghc-commits mailing list