summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Lindblad <lindblad@gmx.us>2022-07-17 15:18:04 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-07-18 08:05:27 -0400
commitaf6731a40782b418947d376a09fd605111dfea2a (patch)
tree92bec7177bdc4e52713e019684ad0ca43b5e50e1
parent19e7cac99d7cbbba4ff9aa42f6877daa81f197d0 (diff)
downloadhaskell-af6731a40782b418947d376a09fd605111dfea2a.tar.gz
typos
-rw-r--r--libraries/base/Data/Ord.hs2
-rw-r--r--libraries/base/Data/Semigroup/Internal.hs2
-rw-r--r--libraries/base/Data/Traversable.hs2
-rw-r--r--libraries/base/GHC/Base.hs2
-rw-r--r--libraries/base/GHC/Event/Windows/FFI.hsc6
-rw-r--r--libraries/base/GHC/Foreign.hs4
-rw-r--r--libraries/base/GHC/ForeignPtr.hs2
-rw-r--r--libraries/base/GHC/IO/Encoding/Failure.hs2
-rw-r--r--libraries/base/GHC/IO/FD.hs2
-rw-r--r--libraries/base/GHC/IO/StdHandles.hs2
-rw-r--r--libraries/base/GHC/IO/Unsafe.hs2
-rw-r--r--libraries/base/GHC/IO/Windows/Paths.hs2
-rw-r--r--libraries/base/GHC/List.hs2
-rw-r--r--libraries/base/GHC/Ptr.hs2
-rw-r--r--libraries/base/GHC/ResponseFile.hs2
-rw-r--r--libraries/base/GHC/Stack/CloneStack.hs10
-rw-r--r--libraries/base/GHC/StaticPtr.hs2
-rw-r--r--libraries/base/GHC/Stats.hsc2
-rw-r--r--libraries/base/GHC/TypeLits/Internal.hs2
-rw-r--r--libraries/base/GHC/TypeNats/Internal.hs2
-rw-r--r--libraries/base/GHC/Weak.hs2
-rw-r--r--libraries/base/Text/Printf.hs2
-rw-r--r--libraries/base/aclocal.m42
-rw-r--r--libraries/base/configure.ac2
-rw-r--r--libraries/base/tests/IO/T18832.hs4
-rw-r--r--libraries/base/tests/IO/T4144.hs2
-rw-r--r--libraries/base/tests/list001.hs2
27 files changed, 35 insertions, 35 deletions
diff --git a/libraries/base/Data/Ord.hs b/libraries/base/Data/Ord.hs
index 7742d714ab..b21acb8e33 100644
--- a/libraries/base/Data/Ord.hs
+++ b/libraries/base/Data/Ord.hs
@@ -51,7 +51,7 @@ comparing p x y = compare (p x) (p y)
-- |
-- > clamp (low, high) a = min high (max a low)
--
--- Function for ensursing the value @a@ is within the inclusive bounds given by
+-- Function for ensuring the value @a@ is within the inclusive bounds given by
-- @low@ and @high@. If it is, @a@ is returned unchanged. The result
-- is otherwise @low@ if @a <= low@, or @high@ if @high <= a@.
--
diff --git a/libraries/base/Data/Semigroup/Internal.hs b/libraries/base/Data/Semigroup/Internal.hs
index a9e0079d0b..e6b79d6079 100644
--- a/libraries/base/Data/Semigroup/Internal.hs
+++ b/libraries/base/Data/Semigroup/Internal.hs
@@ -67,7 +67,7 @@ stimesMonoid n x0 = case compare n 0 of
| y == 1 = x `mappend` z
| otherwise = g (x `mappend` x) (y `quot` 2) (x `mappend` z) -- See Note [Half of y - 1]
--- this is used by the class definitionin GHC.Base;
+-- this is used by the class definition in GHC.Base;
-- it lives here to avoid cycles
stimesDefault :: (Integral b, Semigroup a) => b -> a -> a
stimesDefault y0 x0
diff --git a/libraries/base/Data/Traversable.hs b/libraries/base/Data/Traversable.hs
index 70ad537ce5..497fee9aeb 100644
--- a/libraries/base/Data/Traversable.hs
+++ b/libraries/base/Data/Traversable.hs
@@ -1426,7 +1426,7 @@ foldMapDefault = coerce (traverse @t @(Const m) @a @())
--
-- Since in fact __@'traverse' id@__ is just 'sequenceA' the above boils down
-- to a rather concise definition of /transpose/, with [coercion](#coercion)
--- used to implicily wrap and unwrap the @ZipList@ @newtype@ as neeed, giving
+-- used to implicitly wrap and unwrap the @ZipList@ @newtype@ as needed, giving
-- a function that operates on a list of lists:
--
-- >>> {-# LANGUAGE ScopedTypeVariables #-}
diff --git a/libraries/base/GHC/Base.hs b/libraries/base/GHC/Base.hs
index 0eb2d28969..0ddd256426 100644
--- a/libraries/base/GHC/Base.hs
+++ b/libraries/base/GHC/Base.hs
@@ -1270,7 +1270,7 @@ augment g xs = g (:) xs
-- when we disable the rule that expands (++) into foldr
-- The foldr/cons rule looks nice, but it can give disastrously
--- bloated code when commpiling
+-- bloated code when compiling
-- array (a,b) [(1,2), (2,2), (3,2), ...very long list... ]
-- i.e. when there are very very long literal lists
-- So I've disabled it for now. We could have special cases
diff --git a/libraries/base/GHC/Event/Windows/FFI.hsc b/libraries/base/GHC/Event/Windows/FFI.hsc
index 1705644b74..552b2008b7 100644
--- a/libraries/base/GHC/Event/Windows/FFI.hsc
+++ b/libraries/base/GHC/Event/Windows/FFI.hsc
@@ -263,7 +263,7 @@ instance Storable CompletionData where
-- | Tag type for @LPOVERLAPPED@.
data OVERLAPPED
--- | Tag type for the extended version of @OVERLAPPED@ containg some book
+-- | Tag type for the extended version of @OVERLAPPED@ containing some book
-- keeping information.
data HASKELL_OVERLAPPED
@@ -305,7 +305,7 @@ instance Storable OVERLAPPED_ENTRY where
-- | Allocate a new
-- <http://msdn.microsoft.com/en-us/library/windows/desktop/ms684342%28v=vs.85%29.aspx
-- OVERLAPPED> structure on the unmanaged heap. This also zeros the memory to
--- prevent the values inside the struct to be incorrectlt interpreted as data
+-- prevent the values inside the struct to be incorrectly interpreted as data
-- payload.
--
-- We extend the overlapped structure with some extra book keeping information
@@ -361,7 +361,7 @@ pokeEventOverlapped lpol event = do
-- [2] https://docs.microsoft.com/en-us/windows/win32/sync/synchronization-and-overlapped-input-and-output
--
-- As such we need to annotate all NativeHandles with a Boolean to indicate
--- wether it's an asynchronous handle or not.
+-- whether it's an asynchronous handle or not.
-- This allows us to manually wait for the completion instead of relying
-- on the I/O system to do the right thing. As we have been using the
-- buffers in async mode we may not have moved the file pointer on the kernel
diff --git a/libraries/base/GHC/Foreign.hs b/libraries/base/GHC/Foreign.hs
index 042745ce11..4792c1b33e 100644
--- a/libraries/base/GHC/Foreign.hs
+++ b/libraries/base/GHC/Foreign.hs
@@ -301,7 +301,7 @@ fail, the call to the continuation never fails and so the caller should respond
first to the size check failing and *then* call the continuation. Making this evident
to the compiler avoids historic space leaks.
-In a previous interation of this code we had a pattern that, somewhat simplified,
+In a previous iteration of this code we had a pattern that, somewhat simplified,
looked like this:
go :: State -> (State -> IO a) -> IO a
@@ -323,6 +323,6 @@ unreachable *after* action returns. This means we keep alive the function closur
for `action` until `action` returns. Which in turn keeps alive the *whole* lazy list
via `action` until the action has fully run.
This went wrong in #20107, where the continuation kept an entire lazy bytestring alive
-rather than allowing it to be incrementaly consumed and collected.
+rather than allowing it to be incrementally consumed and collected.
-}
diff --git a/libraries/base/GHC/ForeignPtr.hs b/libraries/base/GHC/ForeignPtr.hs
index a076027fcb..4c57e9f6ad 100644
--- a/libraries/base/GHC/ForeignPtr.hs
+++ b/libraries/base/GHC/ForeignPtr.hs
@@ -561,7 +561,7 @@ touchForeignPtr :: ForeignPtr a -> IO ()
-- ^This function ensures that the foreign object in
-- question is alive at the given place in the sequence of IO
-- actions. However, this comes with a significant caveat: the contract above
--- does not hold if GHC can demonstrate that the code preceeding
+-- does not hold if GHC can demonstrate that the code preceding
-- @touchForeignPtr@ diverges (e.g. by looping infinitely or throwing an
-- exception). For this reason, you are strongly advised to use instead
-- 'withForeignPtr' where possible.
diff --git a/libraries/base/GHC/IO/Encoding/Failure.hs b/libraries/base/GHC/IO/Encoding/Failure.hs
index 5b8de73b6b..fb885bd45b 100644
--- a/libraries/base/GHC/IO/Encoding/Failure.hs
+++ b/libraries/base/GHC/IO/Encoding/Failure.hs
@@ -61,7 +61,7 @@ data CodingFailureMode
-- Roundtripping is based on the ideas of PEP383.
--
-- We used to use the range of private-use characters from 0xEF80 to
--- 0xEFFF designated for "encoding hacks" by the ConScript Unicode Registery
+-- 0xEFFF designated for "encoding hacks" by the ConScript Unicode Registry
-- to encode these characters.
--
-- However, people didn't like this because it means we don't get
diff --git a/libraries/base/GHC/IO/FD.hs b/libraries/base/GHC/IO/FD.hs
index e97229704c..951a3ebecc 100644
--- a/libraries/base/GHC/IO/FD.hs
+++ b/libraries/base/GHC/IO/FD.hs
@@ -177,7 +177,7 @@ writeBuf' fd buf = do
-- file. If an exception occurs in @act1@, then the file will be closed.
-- @act1@ /must not/ close the file itself. If it does so and then receives an
-- exception, then the exception handler will attempt to close it again, which
--- is impermissable.
+-- is impermissible.
--
-- @act2@ is performed with asynchronous exceptions masked. It is passed a
-- function to restore the masking state and the result of @act1@. It /must
diff --git a/libraries/base/GHC/IO/StdHandles.hs b/libraries/base/GHC/IO/StdHandles.hs
index cdb7d0eb47..6891a79d4e 100644
--- a/libraries/base/GHC/IO/StdHandles.hs
+++ b/libraries/base/GHC/IO/StdHandles.hs
@@ -12,7 +12,7 @@
-- Stability : internal
-- Portability : non-portable
--
--- This model abtracts away the platform specific handles that can be toggled
+-- This model abstracts away the platform specific handles that can be toggled
-- through the RTS.
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/GHC/IO/Unsafe.hs b/libraries/base/GHC/IO/Unsafe.hs
index 98d2e12345..5f7e66060a 100644
--- a/libraries/base/GHC/IO/Unsafe.hs
+++ b/libraries/base/GHC/IO/Unsafe.hs
@@ -47,7 +47,7 @@ Now `r` doesn't look strict, because it's wrapped in a `return`.
But if we were to define unsafePerformIO like this
unsafePerformIO (IO m) = case runRW# m of (# _, r #) -> r
-then we'll push that `case` inside the arugment to runRW#, givign
+then we'll push that `case` inside the argument to runRW#, giving
runRW# (\s -> case lockMemoTable s of s1 ->
let r = f x in
case updateMemoTable s1 of s2 ->
diff --git a/libraries/base/GHC/IO/Windows/Paths.hs b/libraries/base/GHC/IO/Windows/Paths.hs
index c755996f22..add56030d7 100644
--- a/libraries/base/GHC/IO/Windows/Paths.hs
+++ b/libraries/base/GHC/IO/Windows/Paths.hs
@@ -35,7 +35,7 @@ foreign import ccall safe "__hs_create_device_name"
-- | This function converts Windows paths between namespaces. More specifically
-- It converts an explorer style path into a NT or Win32 namespace.
--- This has several caveats but they are caviats that are native to Windows and
+-- This has several caveats but they are caveats that are native to Windows and
-- not POSIX. See
-- https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx.
-- Anything else such as raw device paths we leave untouched. The main benefit
diff --git a/libraries/base/GHC/List.hs b/libraries/base/GHC/List.hs
index 6523c40f73..6b1a94fafe 100644
--- a/libraries/base/GHC/List.hs
+++ b/libraries/base/GHC/List.hs
@@ -720,7 +720,7 @@ maximum [] = errorEmptyList "maximum"
maximum xs = foldl1' max xs
-- We want this to be specialized so that with a strict max function, GHC
--- produces good code. Note that to see if this is happending, one has to
+-- produces good code. Note that to see if this is happening, one has to
-- look at -ddump-prep, not -ddump-core!
{-# SPECIALIZE maximum :: [Int] -> Int #-}
{-# SPECIALIZE maximum :: [Integer] -> Integer #-}
diff --git a/libraries/base/GHC/Ptr.hs b/libraries/base/GHC/Ptr.hs
index f19e7b90c8..3cf75304dc 100644
--- a/libraries/base/GHC/Ptr.hs
+++ b/libraries/base/GHC/Ptr.hs
@@ -39,7 +39,7 @@ import Numeric ( showHex )
-- Data pointers.
-- The role of Ptr's parameter is phantom, as there is no relation between
--- the Haskell representation and whathever the user puts at the end of the
+-- the Haskell representation and whatever the user puts at the end of the
-- pointer. And phantom is useful to implement castPtr (see #9163)
-- redundant role annotation checks that this doesn't change
diff --git a/libraries/base/GHC/ResponseFile.hs b/libraries/base/GHC/ResponseFile.hs
index 6d3df4454b..831efbfb9e 100644
--- a/libraries/base/GHC/ResponseFile.hs
+++ b/libraries/base/GHC/ResponseFile.hs
@@ -92,7 +92,7 @@ unescapeArgs = filter (not . null) . unescape
--
-- While 'unescapeArgs' allows using quoting (i.e., convenient
-- escaping of many characters) by having matching sets of single- or
--- double-quotes,'escapeArgs' does not use the quoting mechasnism,
+-- double-quotes,'escapeArgs' does not use the quoting mechanism,
-- and thus will always escape any whitespace, quotes, and
-- backslashes.
--
diff --git a/libraries/base/GHC/Stack/CloneStack.hs b/libraries/base/GHC/Stack/CloneStack.hs
index f06ecad070..4b531ed875 100644
--- a/libraries/base/GHC/Stack/CloneStack.hs
+++ b/libraries/base/GHC/Stack/CloneStack.hs
@@ -86,7 +86,7 @@ There are two different ways to clone a stack:
1. `cloneMyStack#` - A primop for cloning the active thread's stack.
2. `sendCloneStackMessage#` - A primop for cloning another thread's stack.
Sends a RTS message (Messages.c) with a MVar to that thread. The cloned
- stack is reveived by taking it out of this MVar.
+ stack is received by taking it out of this MVar.
`cloneMyStack#` has to be a primop, because new primitive types
(`StackSnapshot#`) cannot be marshalled by FFI. Using a `Ptr StackSnapshot` as
@@ -201,7 +201,7 @@ cloneThreadStack (ThreadId tid#) = do
freeStablePtr boxedPtr
takeMVar resultVar
--- | Represetation for the source location where a return frame was pushed on the stack.
+-- | Representation for the source location where a return frame was pushed on the stack.
-- This happens every time when a @case ... of@ scrutinee is evaluated.
data StackEntry = StackEntry
{ functionName :: String,
@@ -230,12 +230,12 @@ data StackEntry = StackEntry
decode :: StackSnapshot -> IO [StackEntry]
decode stackSnapshot = do
stackEntries <- getDecodedStackArray stackSnapshot
- ipes <- mapM unmarshall stackEntries
+ ipes <- mapM unmarshal stackEntries
return $ catMaybes ipes
where
- unmarshall :: Ptr InfoProvEnt -> IO (Maybe StackEntry)
- unmarshall ipe = if ipe == nullPtr then
+ unmarshal :: Ptr InfoProvEnt -> IO (Maybe StackEntry)
+ unmarshal ipe = if ipe == nullPtr then
pure Nothing
else do
infoProv <- (peekInfoProv . ipeProv) ipe
diff --git a/libraries/base/GHC/StaticPtr.hs b/libraries/base/GHC/StaticPtr.hs
index 5ec74c63eb..f7042f11ab 100644
--- a/libraries/base/GHC/StaticPtr.hs
+++ b/libraries/base/GHC/StaticPtr.hs
@@ -28,7 +28,7 @@
-- table is known as the Static Pointer Table. The reference can then be
-- dereferenced to obtain the value.
--
--- The various communicating processes need to aggree on the keys used to refer
+-- The various communicating processes need to agree on the keys used to refer
-- to the values in the Static Pointer Table, or lookups will fail. Only
-- processes launched from the same program binary are guaranteed to use the
-- same set of keys.
diff --git a/libraries/base/GHC/Stats.hsc b/libraries/base/GHC/Stats.hsc
index 0d772ba765..8504e1fff3 100644
--- a/libraries/base/GHC/Stats.hsc
+++ b/libraries/base/GHC/Stats.hsc
@@ -140,7 +140,7 @@ data GCDetails = GCDetails {
, gcdetails_threads :: Word32
-- | Number of bytes allocated since the previous GC
, gcdetails_allocated_bytes :: Word64
- -- | Total amount of live data in the heap (incliudes large + compact data).
+ -- | Total amount of live data in the heap (includes large + compact data).
-- Updated after every GC. Data in uncollected generations (in minor GCs)
-- are considered live.
, gcdetails_live_bytes :: Word64
diff --git a/libraries/base/GHC/TypeLits/Internal.hs b/libraries/base/GHC/TypeLits/Internal.hs
index 052394065e..0a3a025374 100644
--- a/libraries/base/GHC/TypeLits/Internal.hs
+++ b/libraries/base/GHC/TypeLits/Internal.hs
@@ -7,7 +7,7 @@
{-|
This module exports the Type Literal kinds as well as the comparison type
families for those kinds. It is needed to prevent module cycles while still
-allowing these identifiers to be improted in 'Data.Type.Ord'.
+allowing these identifiers to be imported in 'Data.Type.Ord'.
@since 4.16.0.0
-}
diff --git a/libraries/base/GHC/TypeNats/Internal.hs b/libraries/base/GHC/TypeNats/Internal.hs
index 7ae787310f..06643b4e84 100644
--- a/libraries/base/GHC/TypeNats/Internal.hs
+++ b/libraries/base/GHC/TypeNats/Internal.hs
@@ -7,7 +7,7 @@
{-|
This module exports the Type Nat kind as well as the comparison type
family for that kinds. It is needed to prevent module cycles while still
-allowing these identifiers to be improted in 'Data.Type.Ord'.
+allowing these identifiers to be imported in 'Data.Type.Ord'.
@since 4.16.0.0
-}
diff --git a/libraries/base/GHC/Weak.hs b/libraries/base/GHC/Weak.hs
index 9eff415c99..6d3dcb2d7f 100644
--- a/libraries/base/GHC/Weak.hs
+++ b/libraries/base/GHC/Weak.hs
@@ -59,7 +59,7 @@ addition to finalizers.
References from the finalizer to the key are treated in the same way
as references from the value to the key: they do not keep the key
-alive. A finalizer may therefore ressurrect the key, perhaps by
+alive. A finalizer may therefore resurrect the key, perhaps by
storing it in the same data structure.
The finalizer, and the relationship between the key and the value,
diff --git a/libraries/base/Text/Printf.hs b/libraries/base/Text/Printf.hs
index 397f916265..14c8d7ffe3 100644
--- a/libraries/base/Text/Printf.hs
+++ b/libraries/base/Text/Printf.hs
@@ -63,7 +63,7 @@ module Text.Printf(
-- ** Standard Formatters
--
-- | These formatters for standard types are provided for
--- convenience in writting new type-specific formatters:
+-- convenience in writing new type-specific formatters:
-- a common pattern is to throw to 'formatString' or
-- 'formatInteger' to do most of the format handling for
-- a new type.
diff --git a/libraries/base/aclocal.m4 b/libraries/base/aclocal.m4
index 0336a092a8..083a427fc7 100644
--- a/libraries/base/aclocal.m4
+++ b/libraries/base/aclocal.m4
@@ -119,7 +119,7 @@ AC_DEFUN([FPTOOLS_HTYPE_INCLUDES],
dnl ** Map an arithmetic C type to a Haskell type.
-dnl Based on autconf's AC_CHECK_SIZEOF.
+dnl Based on autoconf's AC_CHECK_SIZEOF.
dnl FPTOOLS_CHECK_HTYPE_ELSE(TYPE, WHAT_TO_DO_IF_TYPE_DOES_NOT_EXIST)
AC_DEFUN([FPTOOLS_CHECK_HTYPE_ELSE],[
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index 6fc96d92f4..31bb7e6a0f 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([include/HsBase.h])
AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h])
AC_PROG_CC
-dnl make extensions visible to allow feature-tests to detect them lateron
+dnl make extensions visible to allow feature-tests to detect them later on
AC_USE_SYSTEM_EXTENSIONS
AC_MSG_CHECKING(for WINDOWS platform)
diff --git a/libraries/base/tests/IO/T18832.hs b/libraries/base/tests/IO/T18832.hs
index b4e1be12ea..30a175ee69 100644
--- a/libraries/base/tests/IO/T18832.hs
+++ b/libraries/base/tests/IO/T18832.hs
@@ -12,8 +12,8 @@ import Control.Concurrent
-- How many `openHandle` calls in the test
-- On a laptop:
--- * when set to 1k, it ocasionally reproduces the failure
--- * when set to 10k, it ocasionally fails to reproduce
+-- * when set to 1k, it occasionally reproduces the failure
+-- * when set to 10k, it occasionally fails to reproduce
n :: Int
n = 10000
diff --git a/libraries/base/tests/IO/T4144.hs b/libraries/base/tests/IO/T4144.hs
index 4656471794..92bfc6c689 100644
--- a/libraries/base/tests/IO/T4144.hs
+++ b/libraries/base/tests/IO/T4144.hs
@@ -23,7 +23,7 @@ import GHC.IO.Handle
import System.IO
--- | Create a seakable read-handle from a bytestring
+-- | Create a seekable read-handle from a bytestring
bsHandle :: ByteString -> FilePath -> IO Handle
bsHandle bs fp
= newBsDevice bs >>= \dev ->
diff --git a/libraries/base/tests/list001.hs b/libraries/base/tests/list001.hs
index 8f3babe607..a411952110 100644
--- a/libraries/base/tests/list001.hs
+++ b/libraries/base/tests/list001.hs
@@ -98,7 +98,7 @@ main = do
-- notElem
print [notElem 5 [1..10], notElem 0 [1..10], notElem 1 []]
- -- lookkup
+ -- lookup
print (lookup 4 (zip [1..10] (reverse [1..10])))
-- sum