Merge pull request #10613 from cabalism/typos/in-hs-files

Fix typos in `*.hs` files

Author: mergify[bot]

Cabal-syntax/src/Distribution/Backpack.hs

@@ -70,7 +70,7 @@ import qualified Data.Set as Set
 -- represent it as a 'DefiniteUnitId uid'.
 --
 -- For a source component using Backpack, however, there is more
--- structure as components may be parametrized over some signatures, and
+-- structure as components may be parameterized over some signatures, and
 -- these \"holes\" may be partially or wholly filled.
 --
 -- OpenUnitId plays an important role when we are mix-in linking,

Cabal-syntax/src/Distribution/Fields/Field.hs

@@ -6,7 +6,7 @@
 
 -- | Cabal-like file AST types: 'Field', 'Section' etc
 --
--- These types are parametrized by an annotation.
+-- These types are parameterized by an annotation.
 module Distribution.Fields.Field
   ( -- * Cabal file
     Field (..)

Cabal-syntax/src/Distribution/Fields/LexerMonad.hs

@@ -94,7 +94,7 @@ toPWarnings =
       Just $ PWarning PWTLexTab (NE.head poss) $ "Tabs used as indentation at " ++ intercalate ", " (NE.toList $ fmap showPos poss)
     toWarning LexInconsistentIndentation poss =
       Just $ PWarning PWTInconsistentIndentation (NE.head poss) $ "Inconsistent indentation. Indentation jumps at lines " ++ intercalate ", " (NE.toList $ fmap (show . positionRow) poss)
-    -- LexBraces warning about using { } delimeters is not reported as parser warning.
+    -- LexBraces warning about using { } delimiters is not reported as parser warning.
     toWarning LexBraces _ =
       Nothing
 

Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs

@@ -679,7 +679,7 @@ processImports v fromBuildInfo commonStanzas = go []
       fields' <- catMaybes <$> traverse (warnImport v) fields
       pure $ (fields', \x -> foldr (mergeCommonStanza fromBuildInfo) x acc)
 
--- | Warn on "import" fields, also map to Maybe, so errorneous fields can be filtered
+-- | Warn on "import" fields, also map to Maybe, so erroneous fields can be filtered
 warnImport :: CabalSpecVersion -> Field Position -> ParseResult (Maybe (Field Position))
 warnImport v (Field (Name pos name) _) | name == "import" = do
   if specHasCommonStanzas v == NoCommonStanzas

Cabal-syntax/src/Distribution/SPDX/LicenseId.hs

@@ -677,7 +677,7 @@ data LicenseId
   deriving (Eq, Ord, Enum, Bounded, Show, Read, Typeable, Data)
 
 instance Binary LicenseId where
-    -- Word16 is encoded in big endianess
+    -- Word16 is encoded in big endianness
     -- https://github.com/kolmodin/binary/blob/master/src/Data/Binary/Class.hs#L220-LL227
     put = Binary.putWord16be . fromIntegral . fromEnum
     get = do

Cabal-syntax/src/Distribution/Types/VersionInterval.hs

@@ -95,7 +95,7 @@ isVersion0 = (==) version0
 stage1 :: VersionRange -> [VersionInterval]
 stage1 = cataVersionRange alg
   where
-    -- version range leafs transform into singleton intervals
+    -- version range leaves transform into singleton intervals
     alg (ThisVersionF v) = [VersionInterval (LowerBound v InclusiveBound) (UpperBound v InclusiveBound)]
     alg (LaterVersionF v) = [VersionInterval (LowerBound v ExclusiveBound) NoUpperBound]
     alg (OrLaterVersionF v) = [VersionInterval (LowerBound v InclusiveBound) NoUpperBound]

Cabal-tests/tests/ParserTests.hs

@@ -140,7 +140,7 @@ errorTest fp = cabalGoldenTest fp correct $ do
 
     return $ toUTF8BS $ case x of
         Right gpd ->
-            "UNXPECTED SUCCESS\n" ++
+            "UNEXPECTED SUCCESS\n" ++
             showGenericPackageDescription gpd
         Left (v, errs) ->
             unlines $ ("VERSION: " ++ show v) : map (showPError fp) (NE.toList errs)

Cabal-tests/tests/UnitTests/Distribution/SPDX.hs

@@ -91,7 +91,7 @@ shouldReject = map License
 --
 -- * "WITH exc" exceptions are rejected
 --
--- * There should be a way to interpert license as (conjunction of)
+-- * There should be a way to interpret license as (conjunction of)
 --   OSI-accepted licenses or CC0
 --
 isAcceptableLicense :: License -> Bool

Cabal/src/Distribution/GetOpt.hs

@@ -134,11 +134,11 @@ zipDefault ad bd (a : as) (b : bs) = (a, b) : zipDefault ad bd as bs
 -- | Pretty printing of short options.
 -- * With required arguments can be given as:
 --    @-w PATH or -wPATH (but not -w=PATH)@
---   This is dislayed as:
+--   This is displayed as:
 --    @-w PATH or -wPATH@
 -- * With optional but default arguments can be given as:
 --    @-j or -jNUM (but not -j=NUM or -j NUM)@
---   This is dislayed as:
+--   This is displayed as:
 --    @-j[NUM]@
 fmtShort :: ArgDescr a -> Char -> String
 fmtShort (NoArg _) so = "-" ++ [so]
@@ -152,11 +152,11 @@ fmtShort (OptArg _ _ ad) so =
 -- | Pretty printing of long options.
 -- * With required arguments can be given as:
 --    @--with-compiler=PATH (but not --with-compiler PATH)@
---   This is dislayed as:
+--   This is displayed as:
 --    @--with-compiler=PATH@
 -- * With optional but default arguments can be given as:
 --    @--jobs or --jobs=NUM (but not --jobs NUM)@
---   This is dislayed as:
+--   This is displayed as:
 --    @--jobs[=NUM]@
 fmtLong :: ArgDescr a -> String -> String
 fmtLong (NoArg _) lo = "--" ++ lo

Cabal/src/Distribution/PackageDescription/Check/Common.hs

@@ -79,7 +79,7 @@ partitionDeps ads ns ds = do
     -- shared targets that match
     fads = filter (flip elem dqs . fst) ads
     -- the names of such targets
-    inNam = nub $ map fst fads :: [UnqualComponentName]
+    inName = nub $ map fst fads :: [UnqualComponentName]
     -- the dependencies of such targets
     inDep = concatMap snd fads :: [Dependency]
 
@@ -96,7 +96,7 @@ partitionDeps ads ns ds = do
   --                     text,             ← no warning, inherited
   --                     monadacme         ← warning!
   let fFun d =
-        notElem (unqualName d) inNam
+        notElem (unqualName d) inName
           && notElem
             (unqualName d)
             (map unqualName inDep)
@@ -116,7 +116,7 @@ partitionDeps ads ns ds = do
 -- for important dependencies like base).
 checkPVP
   :: Monad m
-  => (String -> PackageCheck) -- Warn message dependend on name
+  => (String -> PackageCheck) -- Warn message depends on name
   -- (e.g. "base", "Cabal").
   -> [Dependency]
   -> CheckM m ()