summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2015-10-05 14:05:56 +0200
committerGabor Greif <ggreif@gmail.com>2015-10-05 14:07:10 +0200
commit7fcfee1c6d2199a422d47e9d4cdcd4b24f48ba4f (patch)
treef338bd11b421894e51914357aa54b216c9db5353 /compiler
parentc0bdfee72de789d0cfbd8d93a2111f348660cfbc (diff)
downloadhaskell-7fcfee1c6d2199a422d47e9d4cdcd4b24f48ba4f.tar.gz
A few typos in comments
Diffstat (limited to 'compiler')
-rw-r--r--compiler/coreSyn/CoreUnfold.hs2
-rw-r--r--compiler/typecheck/TcUnify.hs4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs
index b04c13d886..edbe503fc4 100644
--- a/compiler/coreSyn/CoreUnfold.hs
+++ b/compiler/coreSyn/CoreUnfold.hs
@@ -1239,7 +1239,7 @@ CONLIKE thing (modulo lets).
Note [Lone variables] See also Note [Interaction of exprIsWorkFree and lone variables]
~~~~~~~~~~~~~~~~~~~~~ which appears below
The "lone-variable" case is important. I spent ages messing about
-with unsatisfactory varaints, but this is nice. The idea is that if a
+with unsatisfactory variants, but this is nice. The idea is that if a
variable appears all alone
as an arg of lazy fn, or rhs BoringCtxt
diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index 2e3834e3cb..8042cc58c3 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -850,7 +850,7 @@ We may encounter a unification ty1 ~ ty2 that cannot be performed syntactically,
and yet its consistency is undetermined. Previously, there was no way to still
make it consistent. So a mismatch error was issued.
-Now these unfications are deferred until constraint simplification, where type
+Now these unifications are deferred until constraint simplification, where type
family instances and given equations may (or may not) establish the consistency.
Deferred unifications are of the form
F ... ~ ...
@@ -860,7 +860,7 @@ E.g.
id :: x ~ y => x -> y
id e = e
-involves the unfication x = y. It is deferred until we bring into account the
+involves the unification x = y. It is deferred until we bring into account the
context x ~ y to establish that it holds.
If available, we defer original types (rather than those where closed type