[commit: ghc] master: Fix ungrammatical error message (acbbb50)

git at git.haskell.org git at git.haskell.org
Sat Jul 22 03:11:11 UTC 2017


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

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

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

commit acbbb502014a2e0d08fec533990474876f746b89
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Fri Jul 21 23:08:24 2017 -0400

    Fix ungrammatical error message
    
    Test Plan: If it builds, ship it
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3772


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

acbbb502014a2e0d08fec533990474876f746b89
 compiler/rename/RnSource.hs                                             | 2 +-
 .../tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index ff7251e..244f46b 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -964,7 +964,7 @@ rnSrcDerivDecl (DerivDecl ty deriv_strat overlap)
        ; unless standalone_deriv_ok (addErr standaloneDerivErr)
        ; failIfTc (isJust deriv_strat && not deriv_strats_ok) $
            illegalDerivStrategyErr $ fmap unLoc deriv_strat
-       ; (ty', fvs) <- rnLHsInstType (text "In a deriving declaration") ty
+       ; (ty', fvs) <- rnLHsInstType (text "a deriving declaration") ty
        ; return (DerivDecl ty' deriv_strat overlap, fvs) }
 
 standaloneDerivErr :: SDoc
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr
index 19df37a..8e98910 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr
@@ -3,4 +3,4 @@ WildcardInStandaloneDeriving.hs:4:19: error: Malformed instance: _
 
 WildcardInStandaloneDeriving.hs:4:19: error:
     Wildcard ‘_’ not allowed
-      in In a deriving declaration
+      in a deriving declaration



More information about the ghc-commits mailing list