summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorBrian Wignall <brianwignall@gmail.com>2019-11-08 16:21:03 -0500
committerBrian Wignall <brianwignall@gmail.com>2019-11-23 19:04:52 -0500
commit7b4c7b75be351e9b6a40093cbccab728dd89064f (patch)
tree01126ac3823a1f1b197ac1865d7bc628eb4676a5 /libraries
parentc14b723f7fa24b4db0b561f9ab0d6e0f4261fd2f (diff)
downloadhaskell-7b4c7b75be351e9b6a40093cbccab728dd89064f.tar.gz
Fix typos
Diffstat (limited to 'libraries')
-rw-r--r--libraries/base/Data/Maybe.hs2
-rw-r--r--libraries/base/GHC/List.hs2
-rw-r--r--libraries/integer-gmp/src/GHC/Integer/Type.hs2
3 files changed, 3 insertions, 3 deletions
diff --git a/libraries/base/Data/Maybe.hs b/libraries/base/Data/Maybe.hs
index 2bd0b1e00e..f646faeb9a 100644
--- a/libraries/base/Data/Maybe.hs
+++ b/libraries/base/Data/Maybe.hs
@@ -148,7 +148,7 @@ fromJust :: HasCallStack => Maybe a -> a
fromJust Nothing = error "Maybe.fromJust: Nothing" -- yuck
fromJust (Just x) = x
--- | The 'fromMaybe' function takes a default value and and 'Maybe'
+-- | The 'fromMaybe' function takes a default value and a 'Maybe'
-- value. If the 'Maybe' is 'Nothing', it returns the default values;
-- otherwise, it returns the value contained in the 'Maybe'.
--
diff --git a/libraries/base/GHC/List.hs b/libraries/base/GHC/List.hs
index 6f6d9d670a..9755f525ec 100644
--- a/libraries/base/GHC/List.hs
+++ b/libraries/base/GHC/List.hs
@@ -87,7 +87,7 @@ last [] = errorEmptyList "last"
#else
-- Use foldl to make last a good consumer.
-- This will compile to good code for the actual GHC.List.last.
--- (At least as long it is eta-expaned, otherwise it does not, #10260.)
+-- (At least as long it is eta-expanded, otherwise it does not, #10260.)
last xs = foldl (\_ x -> x) lastError xs
{-# INLINE last #-}
-- The inline pragma is required to make GHC remember the implementation via
diff --git a/libraries/integer-gmp/src/GHC/Integer/Type.hs b/libraries/integer-gmp/src/GHC/Integer/Type.hs
index 14bdb57ffd..333d8e9295 100644
--- a/libraries/integer-gmp/src/GHC/Integer/Type.hs
+++ b/libraries/integer-gmp/src/GHC/Integer/Type.hs
@@ -51,7 +51,7 @@ default ()
--
-- {-# CONSTANT_FOLDED plusInteger #-}
--
--- which is simply expaned into a
+-- which is simply expanded into a
--
-- {-# NOINLINE plusInteger #-}
--