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

git at git.haskell.org git at git.haskell.org
Mon Dec 30 12:11:14 UTC 2013


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

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

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

commit d58a8df39eccafa2a4f3c84de7d8d5c24b44a85d
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sat Dec 28 12:29:05 2013 +0000

    Comments only


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

d58a8df39eccafa2a4f3c84de7d8d5c24b44a85d
 compiler/typecheck/TcRnTypes.lhs |    2 +-
 compiler/typecheck/TcType.lhs    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs
index b7c9790..af66394 100644
--- a/compiler/typecheck/TcRnTypes.lhs
+++ b/compiler/typecheck/TcRnTypes.lhs
@@ -987,7 +987,7 @@ We can't require *equal* kinds, because
 
 Note [Kind orientation for CFunEqCan]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-For (F xis ~ rhs) we require that kind(rhs) is a subkind of kind(lhs).
+For (F xis ~ rhs) we require that kind(lhs) is a subkind of kind(rhs).
 This reallly only maters when rhs is an Open type variable (since only type
 variables have Open kinds):
    F ty ~ (a:Open)
diff --git a/compiler/typecheck/TcType.lhs b/compiler/typecheck/TcType.lhs
index a69b676..55c37b9 100644
--- a/compiler/typecheck/TcType.lhs
+++ b/compiler/typecheck/TcType.lhs
@@ -1050,7 +1050,7 @@ pickyEqType ty1 ty2
 
 Note [Occurs check expansion]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- at occurCheckExpand tv xi@ expands synonyms in xi just enough to get rid
+(occurCheckExpand tv xi) expands synonyms in xi just enough to get rid
 of occurrences of tv outside type function arguments, if that is
 possible; otherwise, it returns Nothing.
 
@@ -1070,7 +1070,7 @@ We have
   occurCheckExpand b (F (G b)) = F Char
 even though we could also expand F to get rid of b.
 
-See also Note [Type synonyms and canonicalization] in TcCanonical
+See also Note [occurCheckExpand] in TcCanonical
 
 \begin{code}
 data OccCheckResult a



More information about the ghc-commits mailing list