[commit: ghc] master: Typofixes [ci skip] (9699286)

[git at git.haskell.org]

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

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

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

commit 969928602aa7b23bcaffe0dbfa885ffce87cea02
Author: Gabor Greif <ggreif at gmail.com>
Date:   Fri Jul 28 20:36:59 2017 +0200

    Typofixes [ci skip]


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

969928602aa7b23bcaffe0dbfa885ffce87cea02
 compiler/basicTypes/Var.hs                      | 2 +-
 compiler/simplStg/StgCse.hs                     | 8 ++++----
 testsuite/tests/dependent/should_fail/T13135.hs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/basicTypes/Var.hs b/compiler/basicTypes/Var.hs
index 58e8d52..9a39e29 100644
--- a/compiler/basicTypes/Var.hs
+++ b/compiler/basicTypes/Var.hs
@@ -159,7 +159,7 @@ type TyCoVar = Id       -- Type, *or* coercion variable
 
 
 {- Many passes apply a substitution, and it's very handy to have type
-   synonyms to remind us whether or not the subsitution has been applied -}
+   synonyms to remind us whether or not the substitution has been applied -}
 
 type InVar      = Var
 type InTyVar    = TyVar
diff --git a/compiler/simplStg/StgCse.hs b/compiler/simplStg/StgCse.hs
index 6bd6adc..ac8e820 100644
--- a/compiler/simplStg/StgCse.hs
+++ b/compiler/simplStg/StgCse.hs
@@ -5,9 +5,9 @@ Note [CSE for Stg]
 ~~~~~~~~~~~~~~~~~~
 This module implements a simple common subexpression elimination pass for STG.
 This is useful because there are expressions that we want to common up (because
-they are operational equivalent), but that we cannot common up in Core, because
+they are operationally equivalent), but that we cannot common up in Core, because
 their types differ.
-This was original reported as #9291.
+This was originally reported as #9291.
 
 There are two types of common code occurrences that we aim for, see
 note [Case 1: CSEing allocated closures] and
@@ -217,7 +217,7 @@ substVar env id = fromMaybe id $ lookupVarEnv (ce_subst env) id
 
 -- Functions to enter binders
 
--- This is much simpler than the requivalent code in CoreSubst:
+-- This is much simpler than the equivalent code in CoreSubst:
 --  * We do not substitute type variables, and
 --  * There is nothing relevant in IdInfo at this stage
 --    that needs substitutions.
@@ -438,7 +438,7 @@ we first replace v with r2. Next we want to replace Right r2 with r1. But the
 ce_conAppMap contains Right a!
 
 Therefore, we add r1 ↦ x to ce_bndrMap when analysing the outer case, and use
-this subsitution before looking Right r2 up in ce_conAppMap, and everything
+this substitution before looking Right r2 up in ce_conAppMap, and everything
 works out.
 
 Note [Free variables of an StgClosure]
diff --git a/testsuite/tests/dependent/should_fail/T13135.hs b/testsuite/tests/dependent/should_fail/T13135.hs
index c39b3f5..772ac78 100644
--- a/testsuite/tests/dependent/should_fail/T13135.hs
+++ b/testsuite/tests/dependent/should_fail/T13135.hs
@@ -62,7 +62,7 @@ arrLen = smartSym sym where
 
 
 
-{- The original bug was a familure to subsitute
+{- The original bug was a failure to substitute
    properly during type-function improvement.
 
 --------------------------------------