[commit: ghc] master: Comments only (f4766c4)

git at git.haskell.org git at git.haskell.org
Fri Jun 27 16:38:01 UTC 2014


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

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

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

commit f4766c4b4ad10ef7c58bc6b443ec244a07c68bf5
Author: Gabor Greif <ggreif at gmail.com>
Date:   Fri Jun 27 18:35:17 2014 +0200

    Comments only


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

f4766c4b4ad10ef7c58bc6b443ec244a07c68bf5
 compiler/typecheck/TcEnv.lhs | 2 +-
 compiler/types/Type.lhs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index be2058f..6020797 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -867,7 +867,7 @@ notFound name
                      ptext (sLit "is not in scope during type checking, but it passed the renamer"),
                      ptext (sLit "tcl_env of environment:") <+> ppr (tcl_env lcl_env)]
                        -- Take case: printing the whole gbl env can
-                       -- cause an infnite loop, in the case where we
+                       -- cause an infinite loop, in the case where we
                        -- are in the middle of a recursive TyCon/Class group;
                        -- so let's just not print it!  Getting a loop here is
                        -- very unhelpful, because it hides one compiler bug with another
diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index 55df6432..ad9e8b5 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -824,7 +824,7 @@ applyTysD doc orig_fun_ty arg_tys
   = substTyWith (take n_args tvs) arg_tys
                 (mkForAllTys (drop n_args tvs) rho_ty)
   | otherwise           -- Too many type args
-  = ASSERT2( n_tvs > 0, doc $$ ppr orig_fun_ty )        -- Zero case gives infnite loop!
+  = ASSERT2( n_tvs > 0, doc $$ ppr orig_fun_ty )        -- Zero case gives infinite loop!
     applyTysD doc (substTyWith tvs (take n_tvs arg_tys) rho_ty)
                   (drop n_tvs arg_tys)
   where



More information about the ghc-commits mailing list