[commit: ghc] master: A few typofixes in comments (9a371d6)
git at git.haskell.org
git at git.haskell.org
Fri Jun 29 12:52:21 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/9a371d6534549496bb3083853645d6e649743fd2/ghc
>---------------------------------------------------------------
commit 9a371d6534549496bb3083853645d6e649743fd2
Author: Gabor Greif <ggreif at gmail.com>
Date: Fri Jun 29 14:50:12 2018 +0200
A few typofixes in comments
>---------------------------------------------------------------
9a371d6534549496bb3083853645d6e649743fd2
compiler/basicTypes/Id.hs | 2 +-
compiler/basicTypes/IdInfo.hs | 2 +-
compiler/coreSyn/CoreUtils.hs | 2 +-
compiler/typecheck/TcUnify.hs | 2 +-
compiler/types/Coercion.hs | 2 +-
testsuite/tests/simplCore/should_compile/T7287.hs | 2 +-
testsuite/tests/simplCore/should_compile/all.T | 2 +-
utils/llvm-targets/gen-data-layout.sh | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/compiler/basicTypes/Id.hs b/compiler/basicTypes/Id.hs
index e38769a..c1d281e 100644
--- a/compiler/basicTypes/Id.hs
+++ b/compiler/basicTypes/Id.hs
@@ -219,7 +219,7 @@ lazySetIdInfo = Var.lazySetIdInfo
setIdInfo :: Id -> IdInfo -> Id
setIdInfo id info = info `seq` (lazySetIdInfo id info)
- -- Try to avoid spack leaks by seq'ing
+ -- Try to avoid space leaks by seq'ing
modifyIdInfo :: HasDebugCallStack => (IdInfo -> IdInfo) -> Id -> Id
modifyIdInfo fn id = setIdInfo id (fn (idInfo id))
diff --git a/compiler/basicTypes/IdInfo.hs b/compiler/basicTypes/IdInfo.hs
index f6febaf..12ea490 100644
--- a/compiler/basicTypes/IdInfo.hs
+++ b/compiler/basicTypes/IdInfo.hs
@@ -263,7 +263,7 @@ setInlinePragInfo :: IdInfo -> InlinePragma -> IdInfo
setInlinePragInfo info pr = pr `seq` info { inlinePragInfo = pr }
setOccInfo :: IdInfo -> OccInfo -> IdInfo
setOccInfo info oc = oc `seq` info { occInfo = oc }
- -- Try to avoid spack leaks by seq'ing
+ -- Try to avoid space leaks by seq'ing
setUnfoldingInfo :: IdInfo -> Unfolding -> IdInfo
setUnfoldingInfo info uf
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index 8f4f84b..3c65072 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -532,7 +532,7 @@ isDefaultAlt _ = False
-- | Find the case alternative corresponding to a particular
-- constructor: panics if no such constructor exists
findAlt :: AltCon -> [(AltCon, a, b)] -> Maybe (AltCon, a, b)
- -- A "Nothing" result *is* legitmiate
+ -- A "Nothing" result *is* legitimate
-- See Note [Unreachable code]
findAlt con alts
= case alts of
diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index 9b32c3c..eb44bc3 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -1778,7 +1778,7 @@ Note [Eliminate younger unification variables]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Given a choice of unifying
alpha := beta or beta := alpha
-we try, if possible, to elimiate the "younger" one, as determined
+we try, if possible, to eliminate the "younger" one, as determined
by `ltUnique`. Reason: the younger one is less likely to appear free in
an existing inert constraint, and hence we are less likely to be forced
into kicking out and rewriting inert constraints.
diff --git a/compiler/types/Coercion.hs b/compiler/types/Coercion.hs
index d0d0e97..346190c 100644
--- a/compiler/types/Coercion.hs
+++ b/compiler/types/Coercion.hs
@@ -1161,7 +1161,7 @@ applyRoles tc cos
= zipWith (\r -> downgradeRole r Nominal) (tyConRolesRepresentational tc) cos
-- the Role parameter is the Role of the TyConAppCo
--- defined here because this is intimiately concerned with the implementation
+-- defined here because this is intimately concerned with the implementation
-- of TyConAppCo
tyConRolesX :: Role -> TyCon -> [Role]
tyConRolesX Representational tc = tyConRolesRepresentational tc
diff --git a/testsuite/tests/simplCore/should_compile/T7287.hs b/testsuite/tests/simplCore/should_compile/T7287.hs
index e4a07b1..bb9035a 100644
--- a/testsuite/tests/simplCore/should_compile/T7287.hs
+++ b/testsuite/tests/simplCore/should_compile/T7287.hs
@@ -7,7 +7,7 @@ import GHC.Prim
"int2Word#/word2Int#" forall x. int2Word# (word2Int# x) = x
#-}
-{- We get a legitmiate
+{- We get a legitimate
T7287.hs:7:3: warning:
Rule int2Word#/word2Int# may never fire because
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 5ad7dba..58e9893 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -113,7 +113,7 @@ test('T5168',
['$MAKE -s --no-print-directory T5168'])
test('T5329', normal, compile, [''])
-test('T5303', normal, compile, ['']) # Coercion-optimiation test
+test('T5303', normal, compile, ['']) # Coercion-optimisation test
test('T5342', normal, compile, ['']) # Lint error with -prof
test('T5359a', normal, compile, ['']) # Lint error with -O (OccurAnal)
test('T5359b', normal, compile, ['']) # Lint error with -O (OccurAnal)
diff --git a/utils/llvm-targets/gen-data-layout.sh b/utils/llvm-targets/gen-data-layout.sh
index ab036a9..3d222d0 100755
--- a/utils/llvm-targets/gen-data-layout.sh
+++ b/utils/llvm-targets/gen-data-layout.sh
@@ -71,7 +71,7 @@ function get_cpu_and_attr() {
done
}
-# first marker to discrimiate the first line being outputted.
+# first marker to discriminate the first line being outputted.
FST=1
# a dummy file to use for the clang invocation.
FILE=_____dummy.c
More information about the ghc-commits
mailing list