Merge branch 'master' into wip/binary-readerTwip/binary-readerT

5 files changed, 6 insertions, 6 deletions

diff --git a/compiler/utils/Binary.hs b/compiler/utils/Binary.hs
index 05a7deb0ef..51d7db1fdf 100644
--- a/compiler/utils/Binary.hs
+++ b/compiler/utils/Binary.hs
@@ -394,7 +394,7 @@ The new scheme also does not depend in any way on
 architecture specific details.
 
 We still use this scheme even with LEB128 available,
-as it has less overhead for truely large numbers. (> maxBound :: Int64)
+as it has less overhead for truly large numbers. (> maxBound :: Int64)
 
 The instance is used for in Binary Integer and Binary Rational in basicTypes/Literal.hs
 -}
diff --git a/compiler/utils/Digraph.hs b/compiler/utils/Digraph.hs
index cb401be274..c205c45d8d 100644
--- a/compiler/utils/Digraph.hs
+++ b/compiler/utils/Digraph.hs
@@ -158,7 +158,7 @@ type ReduceFn key payload =
 Note [reduceNodesIntoVertices implementations]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 reduceNodesIntoVertices is parameterized by the container type.
-This is to accomodate key types that don't have an Ord instance
+This is to accommodate key types that don't have an Ord instance
 and hence preclude the use of Data.Map. An example of such type
 would be Unique, there's no way to implement Ord Unique
 deterministically.
diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs
index bb4504ff1f..0a7981b0c8 100644
--- a/compiler/utils/GraphOps.hs
+++ b/compiler/utils/GraphOps.hs
@@ -264,8 +264,8 @@ delCoalesce k1 k2
 
 
 -- | Add a color preference to the graph, creating nodes if required.
---      The most recently added preference is the most prefered.
---      The algorithm tries to assign a node it's prefered color if possible.
+--      The most recently added preference is the most preferred.
+--      The algorithm tries to assign a node it's preferred color if possible.
 --
 addPreference
         :: Uniquable k
diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs
index cd3e2a5f5b..bbc365b774 100644
--- a/compiler/utils/Outputable.hs
+++ b/compiler/utils/Outputable.hs
@@ -1239,7 +1239,7 @@ warnPprTrace True   file  line  msg x
   where
     heading = hsep [text "WARNING: file", text file <> comma, text "line", int line]
 
--- | Panic with an assertation failure, recording the given file and
+-- | Panic with an assertion failure, recording the given file and
 -- line number. Should typically be accessed with the ASSERT family of macros
 assertPprPanic :: HasCallStack => String -> Int -> SDoc -> a
 assertPprPanic _file _line msg
diff --git a/compiler/utils/UniqDFM.hs b/compiler/utils/UniqDFM.hs
index 1b104a66cd..f9588e9b0b 100644
--- a/compiler/utils/UniqDFM.hs
+++ b/compiler/utils/UniqDFM.hs
@@ -397,7 +397,7 @@ instance Monoid (UniqDFM a) where
   mempty = emptyUDFM
   mappend = (Semi.<>)
 
--- This should not be used in commited code, provided for convenience to
+-- This should not be used in committed code, provided for convenience to
 -- make ad-hoc conversions when developing
 alwaysUnsafeUfmToUdfm :: UniqFM elt -> UniqDFM elt
 alwaysUnsafeUfmToUdfm = listToUDFM_Directly . nonDetUFMToList