summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-06-28 16:40:45 +0200
committerGabor Greif <ggreif@gmail.com>2017-06-28 16:40:45 +0200
commit78c80c250021ccb7a84afaabebe0d69f9b9372ee (patch)
treeb174c8c628e66b3c634658f983bde45f6d64d122
parent87c5fdbba118db1938d699951a811cc2f6206d4d (diff)
downloadhaskell-78c80c250021ccb7a84afaabebe0d69f9b9372ee.tar.gz
Typos in comments and manual [ci skip]
-rw-r--r--compiler/basicTypes/DataCon.hs2
-rw-r--r--compiler/coreSyn/CoreArity.hs2
-rw-r--r--compiler/main/DynFlags.hs2
-rw-r--r--compiler/typecheck/TcUnify.hs4
-rw-r--r--docs/users_guide/glasgow_exts.rst2
-rw-r--r--libraries/base/Control/Monad/ST/Lazy/Imp.hs2
-rw-r--r--testsuite/tests/indexed-types/should_fail/T4485.hs2
7 files changed, 8 insertions, 8 deletions
diff --git a/compiler/basicTypes/DataCon.hs b/compiler/basicTypes/DataCon.hs
index cc475e29d7..1629f3604b 100644
--- a/compiler/basicTypes/DataCon.hs
+++ b/compiler/basicTypes/DataCon.hs
@@ -1052,7 +1052,7 @@ dataConInstSig
-> [Type] -- Instantiate the *universal* tyvars with these types
-> ([TyVar], ThetaType, [Type]) -- Return instantiated existentials
-- theta and arg tys
--- ^ Instantantiate the universal tyvars of a data con,
+-- ^ Instantiate the universal tyvars of a data con,
-- returning the instantiated existentials, constraints, and args
dataConInstSig (MkData { dcUnivTyVars = univ_tvs, dcExTyVars = ex_tvs
, dcEqSpec = eq_spec, dcOtherTheta = theta
diff --git a/compiler/coreSyn/CoreArity.hs b/compiler/coreSyn/CoreArity.hs
index 3ab71d2ae4..3f429d1ad2 100644
--- a/compiler/coreSyn/CoreArity.hs
+++ b/compiler/coreSyn/CoreArity.hs
@@ -317,7 +317,7 @@ do so; it improves some programs significantly, and increasing convergence
isn't a bad thing. Hence the ABot/ATop in ArityType.
So these two transformations aren't always the Right Thing, and we
-have several tickets reporting unexpected bahaviour resulting from
+have several tickets reporting unexpected behaviour resulting from
this transformation. So we try to limit it as much as possible:
(1) Do NOT move a lambda outside a known-bottom case expression
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 366406e989..dac3136579 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -4100,7 +4100,7 @@ impliedXFlags
-- * utils/mkUserGuidePart/Options/
-- * docs/users_guide/using.rst
--
--- The first contains the Flag Refrence section, which breifly lists all
+-- The first contains the Flag Reference section, which briefly lists all
-- available flags. The second contains a detailed description of the
-- flags. Both places should contain information whether a flag is implied by
-- -O0, -O or -O2.
diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index bfaacef5ad..1cbf5741b2 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -900,7 +900,7 @@ In some cases we want to deeply instantiate before filling in
an InferResult, and in some cases not. That's why InferReult
has the ir_inst flag.
-* ir_inst = True: deeply instantantiate
+* ir_inst = True: deeply instantiate
Consider
f x = (*)
@@ -920,7 +920,7 @@ has the ir_inst flag.
Here want to instantiate f's type so that the ?x::Int constraint
gets discharged by the enclosing implicit-parameter binding.
-* ir_inst = False: do not instantantiate
+* ir_inst = False: do not instantiate
Consider this (which uses visible type application):
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 4d8b9adf10..d473841dce 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -12268,7 +12268,7 @@ If we did it in Haskell source, thus ::
let f = ... in f `seq` body
-then ``f``\ 's polymorphic type would get intantiated, so the Core
+then ``f``\ 's polymorphic type would get instantiated, so the Core
translation would be ::
let f = ... in f Any `seq` body
diff --git a/libraries/base/Control/Monad/ST/Lazy/Imp.hs b/libraries/base/Control/Monad/ST/Lazy/Imp.hs
index 67d5838356..4f1204b89f 100644
--- a/libraries/base/Control/Monad/ST/Lazy/Imp.hs
+++ b/libraries/base/Control/Monad/ST/Lazy/Imp.hs
@@ -51,7 +51,7 @@ import qualified Control.Monad.Fail as Fail
-- by @s@, and returns a value of type @a@.
-- The @s@ parameter is either
--
--- * an unstantiated type variable (inside invocations of 'runST'), or
+-- * an uninstantiated type variable (inside invocations of 'runST'), or
--
-- * 'RealWorld' (inside invocations of 'stToIO').
--
diff --git a/testsuite/tests/indexed-types/should_fail/T4485.hs b/testsuite/tests/indexed-types/should_fail/T4485.hs
index c3407cc0d3..060e8571b5 100644
--- a/testsuite/tests/indexed-types/should_fail/T4485.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4485.hs
@@ -6,7 +6,7 @@
-- how to achieve something similar to the old behavior. This is
-- preventing HSP (and by extension, happstack) from migrating to GHC
-- 7. I reported this earlier on the mailing lists, but I have further
--- simplied the test case here.
+-- simplified the test case here.
{-# LANGUAGE TypeFamilies, MultiParamTypeClasses
, FlexibleContexts, FlexibleInstances, UndecidableInstances