[commit: ghc] master: Comments & typos only (755bdc8)
git at git.haskell.org
git at git.haskell.org
Wed Oct 23 13:28:10 UTC 2013
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/755bdc83bde5ebaf9ae46b960328f8a5cea25a4a/ghc
>---------------------------------------------------------------
commit 755bdc83bde5ebaf9ae46b960328f8a5cea25a4a
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date: Mon Oct 21 13:02:37 2013 -0400
Comments & typos only
>---------------------------------------------------------------
755bdc83bde5ebaf9ae46b960328f8a5cea25a4a
compiler/typecheck/TcEvidence.lhs | 2 +-
compiler/typecheck/TcInteract.lhs | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/compiler/typecheck/TcEvidence.lhs b/compiler/typecheck/TcEvidence.lhs
index 4af9120..971d158 100644
--- a/compiler/typecheck/TcEvidence.lhs
+++ b/compiler/typecheck/TcEvidence.lhs
@@ -536,7 +536,7 @@ data EvTerm
-- Note [KnownNat & KnownSymbol and EvLit]
| EvCoercible EvCoercible -- Dictionary for "Coercible a b"
- -- Note [Coercible Instances]
+ -- Note [Coercible Instances] in TcInteract
deriving( Data.Data, Data.Typeable)
diff --git a/compiler/typecheck/TcInteract.lhs b/compiler/typecheck/TcInteract.lhs
index b87c5bd..a6ae1cc 100644
--- a/compiler/typecheck/TcInteract.lhs
+++ b/compiler/typecheck/TcInteract.lhs
@@ -1773,7 +1773,7 @@ matchClassInst _ clas [ ty1, ty2 ] _
traceTcS "matchClassInst for" $ ppr clas <+> ppr ty1 <+> ppr ty2
rdr_env <- getGlobalRdrEnvTcS
safeMode <- safeLanguageOn `fmap` getDynFlags
- ev <- getCoericbleInst safeMode rdr_env ty1 ty2
+ ev <- getCoercibleInst safeMode rdr_env ty1 ty2
traceTcS "matchClassInst returned" $ ppr ev
return ev
@@ -1860,8 +1860,8 @@ matchClassInst inerts clas tys loc
-- See Note [Coercible Instances]
-- Changes to this logic should likely be reflected in coercible_msg in TcErrors.
-getCoericbleInst :: Bool -> GlobalRdrEnv -> TcType -> TcType -> TcS LookupInstResult
-getCoericbleInst safeMode rdr_env ty1 ty2
+getCoercibleInst :: Bool -> GlobalRdrEnv -> TcType -> TcType -> TcS LookupInstResult
+getCoercibleInst safeMode rdr_env ty1 ty2
| ty1 `eqType` ty2
= do return $ GenInst []
$ EvCoercible (EvCoercibleRefl ty1)
@@ -1939,7 +1939,7 @@ Note [Coercible Instances]
~~~~~~~~~~~~~~~~~~~~~~~~~~
The class Coercible is special: There are no regular instances, and the user
cannot even define them. Instead, the type checker will create instances and
-their evidence out of thin air, in getCoericbleInst. The following “instances”
+their evidence out of thin air, in getCoercibleInst. The following “instances”
are present:
1. instance Coercible a a
More information about the ghc-commits
mailing list