[commit: ghc] master: A few typos in comments (7fcfee1)

[git at git.haskell.org]

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

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

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

commit 7fcfee1c6d2199a422d47e9d4cdcd4b24f48ba4f
Author: Gabor Greif <ggreif at gmail.com>
Date:   Mon Oct 5 14:05:56 2015 +0200

    A few typos in comments


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

7fcfee1c6d2199a422d47e9d4cdcd4b24f48ba4f
 compiler/coreSyn/CoreUnfold.hs        | 2 +-
 compiler/typecheck/TcUnify.hs         | 4 ++--
 testsuite/tests/gadt/records-fail1.hs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs
index b04c13d..edbe503 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 2e3834e..8042cc5 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
diff --git a/testsuite/tests/gadt/records-fail1.hs b/testsuite/tests/gadt/records-fail1.hs
index b26404a..12bb3e0 100644
--- a/testsuite/tests/gadt/records-fail1.hs
+++ b/testsuite/tests/gadt/records-fail1.hs
@@ -10,7 +10,7 @@
 -- It's been removed in August 2015
 -- see Phab D1118
 
--- test should result into parse error
+-- test should result in a parse error
 
 module ShouldFail where