[commit: ghc] master: Conditionally show plural "s" in warnings (4f870f8)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4f870f8481b2611619adf66d61eff06f02e3741f/ghc

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

commit 4f870f8481b2611619adf66d61eff06f02e3741f
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Thu Dec 17 12:17:32 2015 +0100

    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


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

4f870f8481b2611619adf66d61eff06f02e3741f
 compiler/typecheck/TcErrors.hs                     | 10 ++++--
 compiler/typecheck/TcValidity.hs                   |  5 ++-
 .../tests/ghc-api/apirecomp001/apirecomp001.stderr | 40 +++++++++++-----------
 testsuite/tests/parser/should_compile/T2245.stderr | 38 ++++++++++----------
 .../tests/typecheck/should_compile/T10971a.stderr  | 34 +++++++++---------
 .../tests/typecheck/should_fail/tcfail204.stderr   | 20 +++++------
 testsuite/tests/warnings/should_compile/PluralS.hs | 27 +++++++++++++++
 .../tests/warnings/should_compile/PluralS.stderr   | 26 ++++++++++++++
 testsuite/tests/warnings/should_compile/all.T      |  1 +
 9 files changed, 131 insertions(+), 70 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4f870f8481b2611619adf66d61eff06f02e3741f