[commit: ghc] master: Fix typos (6a47414)

git at git.haskell.org git at git.haskell.org
Wed Mar 20 05:10:50 UTC 2019


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

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

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

commit 6a47414f0cc6d538fbec7ca537ad36fbcc1a2480
Author: Krzysztof Gogolewski <krzysztof.gogolewski at tweag.io>
Date:   Mon Mar 18 19:31:19 2019 +0100

    Fix typos


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

6a47414f0cc6d538fbec7ca537ad36fbcc1a2480
 compiler/coreSyn/CoreOpt.hs                       | 2 +-
 compiler/simplCore/Simplify.hs                    | 2 +-
 compiler/typecheck/TcBinds.hs                     | 2 +-
 compiler/typecheck/TcErrors.hs                    | 4 ++--
 compiler/typecheck/TcMType.hs                     | 2 +-
 compiler/typecheck/TcType.hs                      | 2 +-
 testsuite/tests/simplCore/should_compile/T7360.hs | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/coreSyn/CoreOpt.hs b/compiler/coreSyn/CoreOpt.hs
index 0f7f5fb..fe9e172 100644
--- a/compiler/coreSyn/CoreOpt.hs
+++ b/compiler/coreSyn/CoreOpt.hs
@@ -710,7 +710,7 @@ A more common case is when
 
    f = \x. error ".."
 
-and again its arity increses (#15517)
+and again its arity increases (#15517)
 -}
 
 {- *********************************************************************
diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index 0130e06..c6bd413 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -2384,7 +2384,7 @@ rebuildCase, reallyRebuildCase
    :: SimplEnv
    -> OutExpr          -- Scrutinee
    -> InId             -- Case binder
-   -> [InAlt]          -- Alternatives (inceasing order)
+   -> [InAlt]          -- Alternatives (increasing order)
    -> SimplCont
    -> SimplM (SimplFloats, OutExpr)
 
diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs
index 9cdc939..c8c1bc0 100644
--- a/compiler/typecheck/TcBinds.hs
+++ b/compiler/typecheck/TcBinds.hs
@@ -1589,7 +1589,7 @@ beta is untouchable.)
 
 Example for (E2), we generate
      q :: beta:1, with constraint (forall:3 a. Integral a => Int ~ beta)
-The beta is untoucable, but floats out of the constraint and can
+The beta is untouchable, but floats out of the constraint and can
 be solved absolutely fine.
 
 
diff --git a/compiler/typecheck/TcErrors.hs b/compiler/typecheck/TcErrors.hs
index b5d98d0..1d639d7 100644
--- a/compiler/typecheck/TcErrors.hs
+++ b/compiler/typecheck/TcErrors.hs
@@ -829,11 +829,11 @@ maybeReportHoleError :: ReportErrCtxt -> Ct -> ErrMsg -> TcM ()
 maybeReportHoleError ctxt ct err
   -- When -XPartialTypeSignatures is on, warnings (instead of errors) are
   -- generated for holes in partial type signatures.
-  -- Unless -fwarn_partial_type_signatures is not on,
+  -- Unless -fwarn-partial-type-signatures is not on,
   -- in which case the messages are discarded.
   | isTypeHoleCt ct
   = -- For partial type signatures, generate warnings only, and do that
-    -- only if -fwarn_partial_type_signatures is on
+    -- only if -fwarn-partial-type-signatures is on
     case cec_type_holes ctxt of
        HoleError -> reportError err
        HoleWarn  -> reportWarning (Reason Opt_WarnPartialTypeSignatures) err
diff --git a/compiler/typecheck/TcMType.hs b/compiler/typecheck/TcMType.hs
index e46cb50..a315611 100644
--- a/compiler/typecheck/TcMType.hs
+++ b/compiler/typecheck/TcMType.hs
@@ -1084,7 +1084,7 @@ Note [CandidatesQTvs determinism and order]
   accumulating-parameter style for candidateQTyVarsOfType so that we
   add variables one at a time, left to right.  That means we tend to
   produce the variables in left-to-right order.  This is just to make
-  it bit more predicatable for the programmer.
+  it bit more predictable for the programmer.
 
 Note [Naughty quantification candidates]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/compiler/typecheck/TcType.hs b/compiler/typecheck/TcType.hs
index 14807da..7a991a6 100644
--- a/compiler/typecheck/TcType.hs
+++ b/compiler/typecheck/TcType.hs
@@ -681,7 +681,7 @@ isSigMaybe _                = Nothing
 
 {- *********************************************************************
 *                                                                      *
-                Untoucable type variables
+                Untouchable type variables
 *                                                                      *
 ********************************************************************* -}
 
diff --git a/testsuite/tests/simplCore/should_compile/T7360.hs b/testsuite/tests/simplCore/should_compile/T7360.hs
index 4e4703c..2bf31f2 100644
--- a/testsuite/tests/simplCore/should_compile/T7360.hs
+++ b/testsuite/tests/simplCore/should_compile/T7360.hs
@@ -15,7 +15,7 @@ fun1 x = case x of
                Foo3 {} -> ()
 
 fun2 x = (fun1 Foo1,  -- Keep -ddump-simpl output 
-                      -- in a predicatable order
+                      -- in a predictable order
          case x of
           [] -> L.length x
           (_:_) -> L.length x)



More information about the ghc-commits mailing list