summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2017-07-12 19:26:37 -0400
committerRyan Scott <ryan.gl.scott@gmail.com>2017-07-12 19:26:37 -0400
commit1909985b412866d9fa1dde51d36b1cf7ff6de8a6 (patch)
tree80419f2b692e947eb536308c1d1afc0b0a474142
parent4700baaf8f9bf3c44a53a595d840c7c14cfd6f98 (diff)
downloadhaskell-1909985b412866d9fa1dde51d36b1cf7ff6de8a6.tar.gz
Fix some excessive spacing in error messages
Test Plan: If it builds, ship it Reviewers: austin, bgamari Subscribers: rwbarton, thomie Differential Revision: https://phabricator.haskell.org/D3729
-rw-r--r--compiler/typecheck/TcClassDcl.hs2
-rw-r--r--testsuite/tests/deriving/should_fail/drvfail011.stderr18
-rw-r--r--testsuite/tests/indexed-types/should_compile/Simple2.stderr8
-rw-r--r--testsuite/tests/typecheck/should_compile/tc254.stderr2
4 files changed, 15 insertions, 15 deletions
diff --git a/compiler/typecheck/TcClassDcl.hs b/compiler/typecheck/TcClassDcl.hs
index 4701197846..a3e9549a1c 100644
--- a/compiler/typecheck/TcClassDcl.hs
+++ b/compiler/typecheck/TcClassDcl.hs
@@ -521,5 +521,5 @@ warnMissingAT name
-- Warn only if -Wmissing-methods AND not a signature
; warnTc (Reason Opt_WarnMissingMethods) (warn && hsc_src /= HsigFile)
(text "No explicit" <+> text "associated type"
- <+> text "or default declaration for "
+ <+> text "or default declaration for"
<+> quotes (ppr name)) }
diff --git a/testsuite/tests/deriving/should_fail/drvfail011.stderr b/testsuite/tests/deriving/should_fail/drvfail011.stderr
index 6ea42e1b08..e29f4e799b 100644
--- a/testsuite/tests/deriving/should_fail/drvfail011.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail011.stderr
@@ -1,10 +1,10 @@
-drvfail011.hs:8:1:
- No instance for (Eq a) arising from a use of ‘==’
- Possible fix: add (Eq a) to the context of the instance declaration
- In the expression: ((a1 == b1))
- In an equation for ‘==’: (==) (T1 a1) (T1 b1) = ((a1 == b1))
- When typechecking the code for ‘==’
- in a derived instance for ‘Eq (T a)’:
- To see the code I am typechecking, use -ddump-deriv
- In the instance declaration for ‘Eq (T a)’
+drvfail011.hs:8:1: error:
+ • No instance for (Eq a) arising from a use of ‘==’
+ Possible fix: add (Eq a) to the context of the instance declaration
+ • In the expression: ((a1 == b1))
+ In an equation for ‘==’: (==) (T1 a1) (T1 b1) = ((a1 == b1))
+ When typechecking the code for ‘==’
+ in a derived instance for ‘Eq (T a)’:
+ To see the code I am typechecking, use -ddump-deriv
+ In the instance declaration for ‘Eq (T a)’
diff --git a/testsuite/tests/indexed-types/should_compile/Simple2.stderr b/testsuite/tests/indexed-types/should_compile/Simple2.stderr
index 4b3b0f619a..c43280e79d 100644
--- a/testsuite/tests/indexed-types/should_compile/Simple2.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Simple2.stderr
@@ -1,6 +1,6 @@
Simple2.hs:21:1: warning: [-Wmissing-methods (in -Wdefault)]
- • No explicit associated type or default declaration for ‘S3n’
+ • No explicit associated type or default declaration for ‘S3n’
• In the instance declaration for ‘C3 Char’
Simple2.hs:21:10: warning: [-Wmissing-methods (in -Wdefault)]
@@ -9,7 +9,7 @@ Simple2.hs:21:10: warning: [-Wmissing-methods (in -Wdefault)]
• In the instance declaration for ‘C3 Char’
Simple2.hs:29:1: warning: [-Wmissing-methods (in -Wdefault)]
- • No explicit associated type or default declaration for ‘S3n’
+ • No explicit associated type or default declaration for ‘S3n’
• In the instance declaration for ‘C3 Bool’
Simple2.hs:29:10: warning: [-Wmissing-methods (in -Wdefault)]
@@ -18,11 +18,11 @@ Simple2.hs:29:10: warning: [-Wmissing-methods (in -Wdefault)]
• In the instance declaration for ‘C3 Bool’
Simple2.hs:39:1: warning: [-Wmissing-methods (in -Wdefault)]
- • No explicit associated type or default declaration for ‘S3’
+ • No explicit associated type or default declaration for ‘S3’
• In the instance declaration for ‘C3 Float’
Simple2.hs:39:1: warning: [-Wmissing-methods (in -Wdefault)]
- • No explicit associated type or default declaration for ‘S3n’
+ • No explicit associated type or default declaration for ‘S3n’
• In the instance declaration for ‘C3 Float’
Simple2.hs:39:10: warning: [-Wmissing-methods (in -Wdefault)]
diff --git a/testsuite/tests/typecheck/should_compile/tc254.stderr b/testsuite/tests/typecheck/should_compile/tc254.stderr
index 663279d71a..2d2c20decb 100644
--- a/testsuite/tests/typecheck/should_compile/tc254.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc254.stderr
@@ -1,4 +1,4 @@
tc254.hs:8:1: warning: [-Wmissing-methods (in -Wdefault)]
- • No explicit associated type or default declaration for ‘Typ’
+ • No explicit associated type or default declaration for ‘Typ’
• In the instance declaration for ‘Cls Int’