[commit: ghc] ghc-7.10: Fix typo: identifer -> identifier (6f31e97)
git at git.haskell.org
git at git.haskell.org
Wed May 6 13:02:14 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-7.10
Link : http://ghc.haskell.org/trac/ghc/changeset/6f31e975aa571daeb5568cafbf8e468545d4ad4f/ghc
>---------------------------------------------------------------
commit 6f31e975aa571daeb5568cafbf8e468545d4ad4f
Author: Vikraman Choudhury <git at vikraman.org>
Date: Wed May 6 07:46:28 2015 -0500
Fix typo: identifer -> identifier
I noticed this typo while using template haskell.
Signed-off-by: Vikraman Choudhury <git at vikraman.org>
Test Plan:
```
λ> :set -XTemplateHaskell
λ> :m +Language.Haskell.TH
λ> data Foo = Foo
λ> $(conE ''Foo)
<interactive>:9:9:
Type constructor ‘Foo’ used where a value identifier was expected
In the expression: Foo
In an equation for ‘f’: f = Foo
```
Reviewed By: bgamari
Differential Revision: https://phabricator.haskell.org/D871
(cherry picked from commit 458a97b86ad154812d08e0fe3548b88ac8412b4f)
Conflicts:
testsuite/tests/rename/should_compile/rn040.hs
>---------------------------------------------------------------
6f31e975aa571daeb5568cafbf8e468545d4ad4f
compiler/typecheck/TcExpr.hs | 2 +-
testsuite/tests/rename/should_compile/rn040.hs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler/typecheck/TcExpr.hs b/compiler/typecheck/TcExpr.hs
index 360cd08..0adeea4 100644
--- a/compiler/typecheck/TcExpr.hs
+++ b/compiler/typecheck/TcExpr.hs
@@ -1114,7 +1114,7 @@ tc_infer_id orig id_name
PatSynCon ps -> tcPatSynBuilderOcc orig ps
_ -> failWithTc $
- ppr thing <+> ptext (sLit "used where a value identifer was expected") }
+ ppr thing <+> ptext (sLit "used where a value identifier was expected") }
where
inst_normal_id id
= do { (wrap, rho) <- deeplyInstantiate orig (idType id)
diff --git a/testsuite/tests/rename/should_compile/rn040.hs b/testsuite/tests/rename/should_compile/rn040.hs
index 3b418f5..2765b13 100644
--- a/testsuite/tests/rename/should_compile/rn040.hs
+++ b/testsuite/tests/rename/should_compile/rn040.hs
@@ -1,7 +1,7 @@
{-# OPTIONS -fwarn-unused-binds #-}
module ShouldCompile where
--- !!! should produce warnings about unused identifers
+-- !!! should produce warnings about unused identifiers
x :: [()]
x = [ () | y <- [] ]
More information about the ghc-commits
mailing list