summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Lindblad <lindblad@gmx.us>2022-03-30 13:00:44 -0500
committerMatthew Pickering <matthewtpickering@gmail.com>2022-04-01 11:04:12 +0100
commit418e6fab732b9aaa0a00c5e235f445fb547ae196 (patch)
tree40c8716387f9b5dec628cb49166c1bc21694fec2
parentb2785cfc60f3c481f35181c41729561113866974 (diff)
downloadhaskell-418e6fab732b9aaa0a00c5e235f445fb547ae196.tar.gz
two typos
-rw-r--r--hadrian/src/Flavour.hs2
-rw-r--r--hadrian/src/Hadrian/Oracles/TextFile.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/src/Flavour.hs b/hadrian/src/Flavour.hs
index 33d4d68ec4..288d5ccc3d 100644
--- a/hadrian/src/Flavour.hs
+++ b/hadrian/src/Flavour.hs
@@ -352,7 +352,7 @@ applySettings kvs = case partitionEithers (map applySetting kvs) of
-- x = -b
-- x += -c
-- produce the final x = "-b -c" value. With just (.) we would apply
- -- the x = -b assignment last, which would silently drop the -c adddition.
+ -- the x = -b assignment last, which would silently drop the -c addition.
--
-- foldr (.) id [f, g, h] = f . g . h
-- -- first function (f) is applied last, we're applying them in
diff --git a/hadrian/src/Hadrian/Oracles/TextFile.hs b/hadrian/src/Hadrian/Oracles/TextFile.hs
index faf2f561ef..560d5d607a 100644
--- a/hadrian/src/Hadrian/Oracles/TextFile.hs
+++ b/hadrian/src/Hadrian/Oracles/TextFile.hs
@@ -67,7 +67,7 @@ lookupValuesOrError file key = fromMaybe (error msg) <$> lookupValues file key
lookupDependencies :: FilePath -> FilePath -> Action (FilePath, [FilePath])
lookupDependencies depFile file = do
let -- .hs needs to come before .hi-boot deps added to fix #14482.
- -- This is still a bit fragile: we have no order guaranty from the input
+ -- This is still a bit fragile: we have no order guarantee from the input
-- file. Let's hope we don't have two different .hs source files (e.g.
-- one included into the other)...
weigh p