[commit: ghc] master: Typofixes [ci skip] (25f01db)
git at git.haskell.org
git at git.haskell.org
Tue May 29 10:26:48 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/25f01db0fa7b20a22136ef770da6361bc3b7a82b/ghc
>---------------------------------------------------------------
commit 25f01db0fa7b20a22136ef770da6361bc3b7a82b
Author: Gabor Greif <ggreif at gmail.com>
Date: Fri May 25 15:33:21 2018 +0200
Typofixes [ci skip]
>---------------------------------------------------------------
25f01db0fa7b20a22136ef770da6361bc3b7a82b
compiler/basicTypes/Name.hs | 4 ++--
compiler/main/HscMain.hs | 2 +-
utils/genprimopcode/Main.hs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/compiler/basicTypes/Name.hs b/compiler/basicTypes/Name.hs
index 6941dd9..c005c03 100644
--- a/compiler/basicTypes/Name.hs
+++ b/compiler/basicTypes/Name.hs
@@ -262,7 +262,7 @@ nameIsLocalOrFrom :: Module -> Name -> Bool
-- you can find details (type, fixity, instances) in the
-- TcGblEnv or TcLclEnv
--
--- The isInteractiveModule part is because successive interactions of a GCHi session
+-- The isInteractiveModule part is because successive interactions of a GHCi session
-- each give rise to a fresh module (Ghci1, Ghci2, etc), but they all come
-- from the magic 'interactive' package; and all the details are kept in the
-- TcLclEnv, TcGblEnv, NOT in the HPT or EPT.
@@ -295,7 +295,7 @@ nameIsHomePackageImport this_mod
this_pkg = moduleUnitId this_mod
-- | Returns True if the Name comes from some other package: neither this
--- pacakge nor the interactive package.
+-- package nor the interactive package.
nameIsFromExternalPackage :: UnitId -> Name -> Bool
nameIsFromExternalPackage this_pkg name
| Just mod <- nameModule_maybe name
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 9012025..cf1a4fb 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -918,7 +918,7 @@ hscCheckSafeImports tcg_env = do
-- | Validate that safe imported modules are actually safe. For modules in the
-- HomePackage (the package the module we are compiling in resides) this just
-- involves checking its trust type is 'Safe' or 'Trustworthy'. For modules
--- that reside in another package we also must check that the external pacakge
+-- that reside in another package we also must check that the external package
-- is trusted. See the Note [Safe Haskell Trust Check] above for more
-- information.
--
diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs
index 07eab0d..c409050 100644
--- a/utils/genprimopcode/Main.hs
+++ b/utils/genprimopcode/Main.hs
@@ -263,7 +263,7 @@ gen_hs_source (Info defaults entries) =
++ "default ()" -- If we don't say this then the default type include Integer
-- so that runs off and loads modules that are not part of
- -- pacakge ghc-prim at all. And that in turn somehow ends up
+ -- package ghc-prim at all. And that in turn somehow ends up
-- with Declaration for $fEqMaybe:
-- attempting to use module ‘GHC.Classes’
-- (libraries/ghc-prim/./GHC/Classes.hs) which is not loaded
More information about the ghc-commits
mailing list