[commit: ghc] wip/redundant-constraints: Modify a couple of error messages slightly (3c1eb86)

git at git.haskell.org git at git.haskell.org
Mon Jan 5 08:42:27 UTC 2015


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

On branch  : wip/redundant-constraints
Link       : http://ghc.haskell.org/trac/ghc/changeset/3c1eb8616f15f2c025db7e8f5df28966bad0abb8/ghc

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

commit 3c1eb8616f15f2c025db7e8f5df28966bad0abb8
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sat Jan 3 23:27:21 2015 +0000

    Modify a couple of error messages slightly
    
    In particular
      In the type signature for:
         f :: Int -> Int
    I added the colon
    
    Also reword the "maybe you haven't applied a function to enough arguments?"
    suggestion to make grammatical sense.
    
    These tiny changes affect a lot of error messages.


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

3c1eb8616f15f2c025db7e8f5df28966bad0abb8
 compiler/typecheck/TcErrors.hs                     |  2 +-
 compiler/typecheck/TcRnTypes.hs                    | 68 +++++++++++++---------
 .../tests/annotations/should_fail/annfail08.stderr |  4 +-
 testsuite/tests/arrows/should_fail/T5380.stderr    |  8 +--
 .../tests/deriving/should_fail/drvfail007.stderr   |  2 +-
 testsuite/tests/driver/T2182.stderr                |  8 +--
 testsuite/tests/gadt/T3169.stderr                  |  4 +-
 testsuite/tests/gadt/T3651.stderr                  |  6 +-
 testsuite/tests/gadt/T7293.stderr                  |  3 +-
 testsuite/tests/gadt/T7294.stderr                  |  3 +-
 testsuite/tests/gadt/T7558.stderr                  |  4 +-
 testsuite/tests/gadt/gadt-escape1.stderr           |  3 +-
 testsuite/tests/gadt/gadt13.stderr                 |  3 +-
 testsuite/tests/gadt/gadt21.stderr                 |  2 +-
 testsuite/tests/gadt/gadt7.stderr                  |  3 +-
 testsuite/tests/gadt/rw.stderr                     |  4 +-
 .../tests/ghci.debugger/scripts/break003.stderr    |  2 +-
 testsuite/tests/ghci/scripts/Defer02.stderr        | 15 +++--
 testsuite/tests/ghci/scripts/T2182ghci.stderr      | 10 ++--
 .../should_compile/PushedInAsGivens.stderr         |  2 +-
 .../indexed-types/should_compile/Simple14.stderr   |  4 +-
 .../indexed-types/should_compile/T3208b.stderr     |  8 +--
 .../indexed-types/should_fail/GADTwrong1.stderr    |  5 +-
 .../indexed-types/should_fail/Overlap6.stderr      |  2 +-
 .../indexed-types/should_fail/SimpleFail5a.stderr  |  2 +-
 .../tests/indexed-types/should_fail/T2664.stderr   |  6 +-
 .../tests/indexed-types/should_fail/T3330a.stderr  |  6 +-
 .../tests/indexed-types/should_fail/T3440.stderr   |  6 +-
 .../tests/indexed-types/should_fail/T4093a.stderr  |  2 +-
 .../tests/indexed-types/should_fail/T4093b.stderr  | 16 ++---
 .../tests/indexed-types/should_fail/T4174.stderr   |  8 +--
 .../tests/indexed-types/should_fail/T4272.stderr   |  2 +-
 .../tests/indexed-types/should_fail/T7194.stderr   |  2 +-
 .../tests/indexed-types/should_fail/T7786.stderr   |  3 +-
 .../tests/indexed-types/should_fail/T9662.stderr   | 36 ++++++------
 testsuite/tests/parser/should_fail/T7848.stderr    |  2 +-
 .../should_fail/AnnotatedConstraint.stderr         |  2 +-
 .../should_fail/NamedWildcardsNotEnabled.stderr    |  4 +-
 testsuite/tests/polykinds/T7230.stderr             | 10 ++--
 testsuite/tests/polykinds/T7438.stderr             |  2 +-
 testsuite/tests/polykinds/T8566.stderr             |  2 +-
 testsuite/tests/rebindable/rebindable6.stderr      |  6 +-
 .../tests/typecheck/should_compile/FD1.stderr      |  2 +-
 .../tests/typecheck/should_compile/FD2.stderr      |  8 +--
 .../tests/typecheck/should_compile/FD3.stderr      |  2 +-
 .../tests/typecheck/should_compile/T7220a.stderr   |  4 +-
 .../tests/typecheck/should_compile/T9834.stderr    | 20 +++----
 .../tests/typecheck/should_compile/tc141.stderr    |  2 +-
 .../typecheck/should_fail/FDsFromGivens.stderr     |  2 +-
 .../should_fail/FailDueToGivenOverlapping.stderr   |  2 +-
 .../typecheck/should_fail/FrozenErrorTests.stderr  |  3 +-
 .../tests/typecheck/should_fail/IPFail.stderr      |  2 +-
 testsuite/tests/typecheck/should_fail/T1899.stderr |  2 +-
 testsuite/tests/typecheck/should_fail/T2714.stderr |  4 +-
 .../tests/typecheck/should_fail/T2846b.stderr      |  2 +-
 testsuite/tests/typecheck/should_fail/T3592.stderr |  4 +-
 testsuite/tests/typecheck/should_fail/T5236.stderr |  2 +-
 testsuite/tests/typecheck/should_fail/T5300.stderr | 10 ++--
 testsuite/tests/typecheck/should_fail/T7453.stderr |  6 +-
 .../tests/typecheck/should_fail/T7748a.stderr      |  2 +-
 .../tests/typecheck/should_fail/T8392a.stderr      |  2 +-
 testsuite/tests/typecheck/should_fail/T8450.stderr |  2 +-
 testsuite/tests/typecheck/should_fail/T9109.stderr |  3 +-
 .../should_fail/TcStaticPointersFail02.stderr      |  4 +-
 testsuite/tests/typecheck/should_fail/mc22.stderr  |  0
 .../tests/typecheck/should_fail/tcfail034.stderr   |  4 +-
 .../tests/typecheck/should_fail/tcfail065.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail067.stderr   | 22 +++----
 .../tests/typecheck/should_fail/tcfail068.stderr   | 34 +++++------
 .../tests/typecheck/should_fail/tcfail072.stderr   |  4 +-
 .../tests/typecheck/should_fail/tcfail097.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail099.stderr   |  3 +-
 .../tests/typecheck/should_fail/tcfail102.stderr   |  4 +-
 .../tests/typecheck/should_fail/tcfail103.stderr   |  4 +-
 .../tests/typecheck/should_fail/tcfail125.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail131.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail142.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail153.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail167.stderr   |  3 +-
 .../tests/typecheck/should_fail/tcfail171.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail174.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail175.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail179.stderr   |  4 +-
 .../tests/typecheck/should_fail/tcfail201.stderr   |  2 +-
 .../tests/typecheck/should_fail/tcfail206.stderr   |  4 +-
 .../tests/typecheck/should_fail/tcfail208.stderr   |  4 +-
 86 files changed, 245 insertions(+), 247 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 3c1eb8616f15f2c025db7e8f5df28966bad0abb8


More information about the ghc-commits mailing list