summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'compiler')
-rw-r--r--compiler/cmm/CmmLayoutStack.hs2
-rw-r--r--compiler/coreSyn/CoreFVs.hs4
-rw-r--r--compiler/coreSyn/CoreSyn.hs2
-rw-r--r--compiler/hsSyn/Convert.hs2
-rw-r--r--compiler/stranal/WwLib.hs2
-rw-r--r--compiler/typecheck/TcGenFunctor.hs2
-rw-r--r--compiler/typecheck/TcInteract.hs2
-rw-r--r--compiler/typecheck/TcSplice.hs2
-rw-r--r--compiler/utils/GraphOps.hs2
9 files changed, 10 insertions, 10 deletions
diff --git a/compiler/cmm/CmmLayoutStack.hs b/compiler/cmm/CmmLayoutStack.hs
index db3e8c7218..0f8495f3e6 100644
--- a/compiler/cmm/CmmLayoutStack.hs
+++ b/compiler/cmm/CmmLayoutStack.hs
@@ -1003,7 +1003,7 @@ live across the call. Our job now is to expand the call so we get
...
Note the copyOut, which saves the results in the places that L1 is
-expecting them (see Note {safe foreign call convention]). Note also
+expecting them (see Note [safe foreign call convention]). Note also
that safe foreign call is replace by an unsafe one in the Cmm graph.
-}
diff --git a/compiler/coreSyn/CoreFVs.hs b/compiler/coreSyn/CoreFVs.hs
index bab7f5fd41..eba64cdb56 100644
--- a/compiler/coreSyn/CoreFVs.hs
+++ b/compiler/coreSyn/CoreFVs.hs
@@ -105,7 +105,7 @@ exprFreeVars :: CoreExpr -> VarSet
exprFreeVars = fvVarSet . exprFVs
-- | Find all locally-defined free Ids or type variables in an expression
--- returning a composable FV computation. See Note [FV naming coventions] in FV
+-- returning a composable FV computation. See Note [FV naming conventions] in FV
-- for why export it.
exprFVs :: CoreExpr -> FV
exprFVs = filterFV isLocalVar . expr_fvs
@@ -150,7 +150,7 @@ exprsFreeVars :: [CoreExpr] -> VarSet
exprsFreeVars = fvVarSet . exprsFVs
-- | Find all locally-defined free Ids or type variables in several expressions
--- returning a composable FV computation. See Note [FV naming coventions] in FV
+-- returning a composable FV computation. See Note [FV naming conventions] in FV
-- for why export it.
exprsFVs :: [CoreExpr] -> FV
exprsFVs exprs = mapUnionFV exprFVs exprs
diff --git a/compiler/coreSyn/CoreSyn.hs b/compiler/coreSyn/CoreSyn.hs
index f8cf6f4dca..2930a24545 100644
--- a/compiler/coreSyn/CoreSyn.hs
+++ b/compiler/coreSyn/CoreSyn.hs
@@ -1151,7 +1151,7 @@ data CoreRule
-- Locality
ru_auto :: Bool, -- ^ @True@ <=> this rule is auto-generated
-- (notably by Specialise or SpecConstr)
- -- @False@ <=> generated at the users behest
+ -- @False@ <=> generated at the user's behest
-- See Note [Trimming auto-rules] in TidyPgm
-- for the sole purpose of this field.
diff --git a/compiler/hsSyn/Convert.hs b/compiler/hsSyn/Convert.hs
index ad4abf89e7..ed1931451b 100644
--- a/compiler/hsSyn/Convert.hs
+++ b/compiler/hsSyn/Convert.hs
@@ -1690,7 +1690,7 @@ specially in `deSugar/DsMeta.hs`, `hsSyn/Convert.hs`, and
The key point is to always represent a pattern synonym's *full* type
in cases (a) and (c) to make it clear which of the two forall
quantifiers and/or constraint contexts are specified, and which are
-not. See GHC's users guide on pattern synonyms for more information
+not. See GHC's user's guide on pattern synonyms for more information
about pattern synonym type signatures.
-}
diff --git a/compiler/stranal/WwLib.hs b/compiler/stranal/WwLib.hs
index 8b02ba0862..8d41426935 100644
--- a/compiler/stranal/WwLib.hs
+++ b/compiler/stranal/WwLib.hs
@@ -465,7 +465,7 @@ To avoid this:
* We use a fresh unique for both type-variable and term-variable binders
Originally we lacked this freshness for type variables, and that led
- to the very obscure Trac #12562. (A type varaible in the worker shadowed
+ to the very obscure Trac #12562. (A type variable in the worker shadowed
an outer term-variable binding.)
* Because of this cloning we have to substitute in the type/kind of the
diff --git a/compiler/typecheck/TcGenFunctor.hs b/compiler/typecheck/TcGenFunctor.hs
index 21875ffa5b..0b89ce28ea 100644
--- a/compiler/typecheck/TcGenFunctor.hs
+++ b/compiler/typecheck/TcGenFunctor.hs
@@ -742,7 +742,7 @@ a is the last type variable in a given datatype):
* ft_var: The type is syntactically equal to the last type variable.
Moreover, the type appears in a covariant position (see
- the Deriving Functor instances section of the users' guide
+ the Deriving Functor instances section of the user's guide
for an in-depth explanation of covariance vs. contravariance).
Example: a (covariantly)
diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs
index 33057cd4fe..13fc0b024d 100644
--- a/compiler/typecheck/TcInteract.hs
+++ b/compiler/typecheck/TcInteract.hs
@@ -764,7 +764,7 @@ Which, because solving `Eq [a]` demands `Eq a` which we cannot solve, produces:
This optimization relies on coherence of dictionaries to be correct. When we
cannot assume coherence because of IncoherentInstances then this optimization
-can change the behavior of the users code.
+can change the behavior of the user's code.
The following four modules produce a program whose output would change depending
on whether we apply this optimization when IncoherentInstances is in effect:
diff --git a/compiler/typecheck/TcSplice.hs b/compiler/typecheck/TcSplice.hs
index 15c3aba063..e142cae3b2 100644
--- a/compiler/typecheck/TcSplice.hs
+++ b/compiler/typecheck/TcSplice.hs
@@ -677,7 +677,7 @@ defaultRunMeta (MetaD r)
defaultRunMeta (MetaAW r)
= fmap r . runMeta' False (const empty) (const convertAnnotationWrapper)
-- We turn off showing the code in meta-level exceptions because doing so exposes
- -- the toAnnotationWrapper function that we slap around the users code
+ -- the toAnnotationWrapper function that we slap around the user's code
----------------
runMetaAW :: LHsExpr Id -- Of type AnnotationWrapper
diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs
index b4b3bd6d8e..0985797571 100644
--- a/compiler/utils/GraphOps.hs
+++ b/compiler/utils/GraphOps.hs
@@ -567,7 +567,7 @@ validateGraph doc isColored graph
, badEdges <- minusUniqSet edges nodes
, not $ isEmptyUniqSet badEdges
= pprPanic "GraphOps.validateGraph"
- ( text "Graph has edges that point to non-existant nodes"
+ ( text "Graph has edges that point to non-existent nodes"
$$ text " bad edges: " <> pprUFM badEdges (vcat . map ppr)
$$ doc )