Conditionally show plural "s" in warnings

Redundant constraints and defaulting warnings had "constraint(s)" in
their messages; the "s" is now conditional based on the number of things
warned about.

Reviewers: hvr, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1647

1 files changed, 19 insertions, 19 deletions

diff --git a/testsuite/tests/parser/should_compile/T2245.stderr b/testsuite/tests/parser/should_compile/T2245.stderr
index 53b738832f..1f5f87f7c7 100644
--- a/testsuite/tests/parser/should_compile/T2245.stderr
+++ b/testsuite/tests/parser/should_compile/T2245.stderr
@@ -1,22 +1,22 @@
 
-T2245.hs:4:10: Warning:
-    No explicit implementation for
-      ‘+’, ‘*’, ‘abs’, ‘signum’, ‘fromInteger’, and (either ‘negate’
-                                                            or
-                                                            ‘-’)
-    In the instance declaration for ‘Num T’
+T2245.hs:4:10: warning:
+    • No explicit implementation for
+        ‘+’, ‘*’, ‘abs’, ‘signum’, ‘fromInteger’, and (either ‘negate’
+                                                              or
+                                                              ‘-’)
+    • In the instance declaration for ‘Num T’
 
-T2245.hs:5:10: Warning:
-    No explicit implementation for
-      ‘fromRational’ and (either ‘recip’ or ‘/’)
-    In the instance declaration for ‘Fractional T’
+T2245.hs:5:10: warning:
+    • No explicit implementation for
+        ‘fromRational’ and (either ‘recip’ or ‘/’)
+    • In the instance declaration for ‘Fractional T’
 
-T2245.hs:7:29: Warning:
-    Defaulting the following constraint(s) to type ‘T’
-      (Fractional b0)
-        arising from the literal ‘1e400’ at T2245.hs:7:29-33
-      (Ord b0) arising from a use of ‘<’ at T2245.hs:7:27
-      (Read b0) arising from a use of ‘read’ at T2245.hs:7:38-41
-    In the second argument of ‘(<)’, namely ‘1e400’
-    In the first argument of ‘(.)’, namely ‘(< 1e400)’
-    In the second argument of ‘(.)’, namely ‘(< 1e400) . read’
+T2245.hs:7:29: warning:
+    • Defaulting the following constraints to type ‘T’
+        (Fractional b0)
+          arising from the literal ‘1e400’ at T2245.hs:7:29-33
+        (Ord b0) arising from a use of ‘<’ at T2245.hs:7:27
+        (Read b0) arising from a use of ‘read’ at T2245.hs:7:38-41
+    • In the second argument of ‘(<)’, namely ‘1e400’
+      In the first argument of ‘(.)’, namely ‘(< 1e400)’
+      In the second argument of ‘(.)’, namely ‘(< 1e400) . read’