Skip to content

Commit

Permalink
Typofixes [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
ggreif committed May 29, 2018
1 parent f804811 commit 25f01db
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions compiler/basicTypes/Name.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/main/HscMain.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
--
Expand Down
2 changes: 1 addition & 1 deletion utils/genprimopcode/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 25f01db

Please sign in to comment.