summaryrefslogtreecommitdiff
path: root/hadrian
diff options
context:
space:
mode:
authorBrian Wignall <brianwignall@gmail.com>2019-12-19 09:11:42 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-01-04 15:55:06 -0500
commit3c9dc06ba2034e867c9169e60e854539875654fd (patch)
treef06e599ca380ee9ad599918b2ae4c78cd4afce2b /hadrian
parentb2e0323f318959c879629ef277f6433b44473c4b (diff)
downloadhaskell-3c9dc06ba2034e867c9169e60e854539875654fd.tar.gz
Fix typos, via a Levenshtein-style corrector
Diffstat (limited to 'hadrian')
-rw-r--r--hadrian/doc/make.md2
-rw-r--r--hadrian/doc/user-settings.md2
-rw-r--r--hadrian/src/Hadrian/Oracles/Cabal/Rules.hs2
-rw-r--r--hadrian/src/Hadrian/Oracles/Cabal/Type.hs2
-rw-r--r--hadrian/src/Hadrian/Oracles/TextFile.hs2
-rw-r--r--hadrian/src/Hadrian/Utilities.hs2
-rw-r--r--hadrian/src/Rules/Documentation.hs2
-rw-r--r--hadrian/src/Rules/Generate.hs2
-rw-r--r--hadrian/src/Rules/Test.hs2
-rw-r--r--hadrian/src/Settings/Builders/Ghc.hs2
10 files changed, 10 insertions, 10 deletions
diff --git a/hadrian/doc/make.md b/hadrian/doc/make.md
index ff51f6d7ba..b0e19e4721 100644
--- a/hadrian/doc/make.md
+++ b/hadrian/doc/make.md
@@ -56,7 +56,7 @@ time you fire up a build. This is not possible with the Make build system.
build -j8
```
-- Bulding a stage 1 or 2 GHC executable
+- Building a stage 1 or 2 GHC executable
``` sh
# Make
diff --git a/hadrian/doc/user-settings.md b/hadrian/doc/user-settings.md
index 2f8397a303..04a526605d 100644
--- a/hadrian/doc/user-settings.md
+++ b/hadrian/doc/user-settings.md
@@ -166,7 +166,7 @@ userPackage = library "user-package"
You will also need to add `userPackage` to a specific build stage by modifying
the `packages` setting of the user flavour as otherwise it will not be built.
-You can choose which integer library to use when builing GHC using the
+You can choose which integer library to use when building GHC using the
`integerLibrary` setting of the build flavour. Possible values are: `integerGmp`
(default) and `integerSimple`.
```haskell
diff --git a/hadrian/src/Hadrian/Oracles/Cabal/Rules.hs b/hadrian/src/Hadrian/Oracles/Cabal/Rules.hs
index b7f0f93526..a8fe8c773a 100644
--- a/hadrian/src/Hadrian/Oracles/Cabal/Rules.hs
+++ b/hadrian/src/Hadrian/Oracles/Cabal/Rules.hs
@@ -6,7 +6,7 @@
-- Maintainer : andrey.mokhov@gmail.com
-- Stability : experimental
--
--- This module defines Shake rules corresponing to the /Cabal oracle/; see
+-- This module defines Shake rules corresponding to the /Cabal oracle/; see
-- the module "Hadrian.Oracles.Cabal" for various supported queries.
-----------------------------------------------------------------------------
module Hadrian.Oracles.Cabal.Rules where
diff --git a/hadrian/src/Hadrian/Oracles/Cabal/Type.hs b/hadrian/src/Hadrian/Oracles/Cabal/Type.hs
index d1b09472ed..c1a3b21b1a 100644
--- a/hadrian/src/Hadrian/Oracles/Cabal/Type.hs
+++ b/hadrian/src/Hadrian/Oracles/Cabal/Type.hs
@@ -9,7 +9,7 @@
--
-- This module defines the types of keys used by the /Cabal oracles/. See the
-- module "Hadrian.Oracles.Cabal" for supported Cabal oracle queries, and the
--- module "Hadrian.Oracles.Cabal.Rules" for the corresponing Shake rules.
+-- module "Hadrian.Oracles.Cabal.Rules" for the corresponding Shake rules.
-----------------------------------------------------------------------------
module Hadrian.Oracles.Cabal.Type where
diff --git a/hadrian/src/Hadrian/Oracles/TextFile.hs b/hadrian/src/Hadrian/Oracles/TextFile.hs
index aef553f70d..d6fb78cc2f 100644
--- a/hadrian/src/Hadrian/Oracles/TextFile.hs
+++ b/hadrian/src/Hadrian/Oracles/TextFile.hs
@@ -82,7 +82,7 @@ type instance RuleResult KeyValues = Maybe [String]
-- 'lookupValueOrEmpty', 'lookupValueOrError', 'lookupValues',
-- 'lookupValuesOrEmpty' and 'lookupValuesOrError'.
--
--- 2) Parsing Makefile dependecy files generated by commands like @gcc -MM@:
+-- 2) Parsing Makefile dependency files generated by commands like @gcc -MM@:
-- see 'lookupDependencies'.
textFileOracle :: Rules ()
textFileOracle = do
diff --git a/hadrian/src/Hadrian/Utilities.hs b/hadrian/src/Hadrian/Utilities.hs
index d726e74141..8c9cfefe81 100644
--- a/hadrian/src/Hadrian/Utilities.hs
+++ b/hadrian/src/Hadrian/Utilities.hs
@@ -214,7 +214,7 @@ makeRelativeNoSysLink a b
-- | Like Shake's '%>' but gives higher priority to longer patterns. Useful
-- in situations when a family of build rules, e.g. @"**/*.a"@ and @"**/*_p.a"@
-- can be matched by the same file, such as @library_p.a@. We break the tie
--- by preferring longer matches, which correpond to longer patterns.
+-- by preferring longer matches, which correspond to longer patterns.
(%%>) :: FilePattern -> (FilePath -> Action ()) -> Rules ()
p %%> a = priority (fromIntegral (length p) + 1) $ p %> a
diff --git a/hadrian/src/Rules/Documentation.hs b/hadrian/src/Rules/Documentation.hs
index 567f71b996..84d008e39b 100644
--- a/hadrian/src/Rules/Documentation.hs
+++ b/hadrian/src/Rules/Documentation.hs
@@ -97,7 +97,7 @@ documentationRules = do
-- include manpage unless --docs=no-sphinx[-man] is given.
++ [ manPageBuildPath | SphinxMan `Set.member` doctargets ]
- -- include toplevel html target uness we neither want
+ -- include toplevel html target unless we neither want
-- haddocks nor html pages produced by sphinx.
++ [ html | Set.size (doctargets `Set.intersection`
Set.fromList [Haddocks, SphinxHTML]
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs
index d0b7f1015a..74759be20e 100644
--- a/hadrian/src/Rules/Generate.hs
+++ b/hadrian/src/Rules/Generate.hs
@@ -215,7 +215,7 @@ ghcWrapper stage = do
++ [ "-package-db " ++ dbPath | stage == Stage1 ]
++ [ "$@" ]
--- | Given a 'String' replace charaters '.' and '-' by underscores ('_') so that
+-- | Given a 'String' replace characters '.' and '-' by underscores ('_') so that
-- the resulting 'String' is a valid C preprocessor identifier.
cppify :: String -> String
cppify = replaceEq '-' '_' . replaceEq '.' '_'
diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs
index 9151188883..71e2f48271 100644
--- a/hadrian/src/Rules/Test.hs
+++ b/hadrian/src/Rules/Test.hs
@@ -80,7 +80,7 @@ testRules = do
"test" ~> do
needTestBuilders
- -- TODO : Should we remove the previosly generated config file?
+ -- TODO : Should we remove the previously generated config file?
-- Prepare Ghc configuration file for input compiler.
need [root -/- ghcConfigPath, root -/- timeoutPath]
diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs
index 60fd8fa726..2549a63e39 100644
--- a/hadrian/src/Settings/Builders/Ghc.hs
+++ b/hadrian/src/Settings/Builders/Ghc.hs
@@ -176,7 +176,7 @@ commonGhcArgs = do
, packageGhcArgs
, includeGhcArgs
-- When compiling RTS for Stage1 or Stage2 we do not have it (yet)
- -- in the package database. We therefore explicity supply the path
+ -- in the package database. We therefore explicitly supply the path
-- to the @ghc-version@ file, to prevent GHC from trying to open the
-- RTS package in the package database and failing.
, package rts ? notStage0 ? arg ("-ghcversion-file=" ++ ghcVersion)