Skip to content

Commit ebfd8c7

Browse files
authored
Merge pull request #8070 from varehus/master
fix spelling errors
2 parents 138cf07 + ea3d7be commit ebfd8c7

File tree

12 files changed

+15
-15
lines changed

12 files changed

+15
-15
lines changed

Cabal/src/Distribution/Backpack/Id.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ computeComponentId
4141
computeComponentId deterministic mb_ipid mb_cid pid cname mb_details =
4242
-- show is found to be faster than intercalate and then replacement of
4343
-- special character used in intercalating. We cannot simply hash by
44-
-- doubly concating list, as it just flatten out the nested list, so
44+
-- doubly concatenating list, as it just flatten out the nested list, so
4545
-- different sources can produce same hash
4646
let hash_suffix
4747
| Just (dep_ipids, flags) <- mb_details

Cabal/src/Distribution/GetOpt.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ data OptHelp = OptHelp {
8383
-- second argument.
8484
usageInfo :: String -- header
8585
-> [OptDescr a] -- option descriptors
86-
-> String -- nicely formatted decription of options
86+
-> String -- nicely formatted description of options
8787
usageInfo header optDescr = unlines (header : table)
8888
where
8989
options = flip map optDescr $ \(Option sos los ad d) ->

cabal-install-solver/src/Distribution/Solver/Modular/Dependency.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ qualifyDeps QO{..} (Q pp@(PackagePath ns q) pn) = go
212212
-- dependency on R. We do not do this for the base qualifier however.
213213
--
214214
-- The inherited qualifier is only used for regular dependencies; for setup
215-
-- and base deppendencies we override the existing qualifier. See #3160 for
215+
-- and base dependencies we override the existing qualifier. See #3160 for
216216
-- a detailed discussion.
217217
inheritedQ :: Qualifier
218218
inheritedQ = case q of

cabal-install/src/Distribution/Client/FileMonitor.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ checkFileMonitorChanged
453453
where
454454
-- In fileMonitorCheckIfOnlyValueChanged mode we want to guarantee that
455455
-- if we return MonitoredValueChanged that only the value changed.
456-
-- We do that by checkin for file changes first. Otherwise it makes
456+
-- We do that by checking for file changes first. Otherwise it makes
457457
-- more sense to do the cheaper test first.
458458
checkForChanges :: IO (Maybe (MonitorChangedReason a))
459459
checkForChanges
@@ -768,7 +768,7 @@ probeMonitorStateGlobRel _ _ root dirName
768768

769769

770770
return (MonitorStateGlobFiles glob mtime' children)
771-
-- Again, we don't force a cache rewite with 'cacheChanged', but we do use
771+
-- Again, we don't force a cache rewrite with 'cacheChanged', but we do use
772772
-- the new mtime' if any.
773773
where
774774
probeMergeResult :: MergeResult (FilePath, MonitorStateFileStatus) FilePath

cabal-install/src/Distribution/Client/GlobalFlags.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ data RepoContext = RepoContext {
112112
--
113113
-- NOTE: It is important that we don't eagerly initialize the transport.
114114
-- Initializing the transport is not free, and especially in contexts where
115-
-- we don't know a-priori whether or not we need the transport (for instance
115+
-- we don't know a priori whether or not we need the transport (for instance
116116
-- when using cabal in "nix mode") incurring the overhead of transport
117117
-- initialization on _every_ invocation (eg @cabal build@) is undesirable.
118118
, repoContextGetTransport :: IO HttpTransport

cabal-install/src/Distribution/Client/HttpUtils.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ wgetTransport prog =
495495

496496
-- wget doesn't support range requests.
497497
-- so, we not only ignore range request headers,
498-
-- but we also dispay a warning message when we see them.
498+
-- but we also display a warning message when we see them.
499499
let hasRangeHeader = any isRangeHeader reqHeaders
500500
warningMsg = "the 'wget' transport currently doesn't support"
501501
++ " range requests, which wastes network bandwidth."

cabal-install/src/Distribution/Client/IndexUtils.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ readRepoIndex :: Verbosity -> RepoContext -> Repo -> RepoIndexState
365365
readRepoIndex verbosity repoCtxt repo idxState =
366366
handleNotFound $ do
367367
when (isRepoRemote repo) $ warnIfIndexIsOld =<< getIndexFileAge repo
368-
-- note that if this step fails due to a bad repocache, the the procedure can still succeed by reading from the existing cache, which is updated regardless.
368+
-- note that if this step fails due to a bad repo cache, the the procedure can still succeed by reading from the existing cache, which is updated regardless.
369369
updateRepoIndexCache verbosity (RepoIndex repoCtxt repo) `catchIO`
370370
(\e -> warn verbosity $ "unable to update the repo index cache -- " ++ displayException e)
371371
readPackageIndexCacheFile verbosity mkAvailablePackage
@@ -1086,7 +1086,7 @@ hashConsCache cache0
10861086
-- If/when we redo the binary serialisation via e.g. CBOR and we
10871087
-- are able to use incremental decoding, we may want to move the
10881088
-- hash-consing into the incremental deserialisation, or
1089-
-- alterantively even do something like
1089+
-- alternatively even do something like
10901090
-- http://cbor.schmorp.de/value-sharing
10911091
--
10921092
go _ _ [] = []

cabal-install/src/Distribution/Client/InstallPlan.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ processingInvariant plan (Processing processingSet completedSet failedSet) =
708708
-- The failed set is upwards closed, i.e. equal to its own rev dep closure
709709
assert (failedSet == reverseClosure failedSet) $
710710

711-
-- All immediate reverse deps of packges that are currently processing
711+
-- All immediate reverse deps of packages that are currently processing
712712
-- are not currently being processed (ie not in the processing set).
713713
assert (and [ rdeppkgid `Set.notMember` processingSet
714714
| pkgid <- Set.toList processingSet

cabal-install/src/Distribution/Client/ProjectBuilding.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ rebuildTargets verbosity
599599
createDirectoryIfMissingVerbose verbosity True distTempDirectory
600600
traverse_ (createPackageDBIfMissing verbosity compiler progdb) packageDBsToUse
601601

602-
-- Before traversing the install plan, pre-emptively find all packages that
602+
-- Before traversing the install plan, preemptively find all packages that
603603
-- will need to be downloaded and start downloading them.
604604
asyncDownloadPackages verbosity withRepoCtx
605605
installPlan pkgsBuildStatus $ \downloadMap ->

cabal-install/src/Distribution/Client/ProjectPlanning.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ elaborateInstallPlan verbosity platform compiler compilerprogdb pkgConfigDB
14051405
-- invocation of the same `./configure` script.
14061406
-- See https://github.com/haskell/cabal/issues/4548
14071407
--
1408-
-- Moreoever, at this point in time, only non-Custom setup scripts
1408+
-- Moreover, at this point in time, only non-Custom setup scripts
14091409
-- are supported. Implementing per-component builds with
14101410
-- Custom would require us to create a new 'ElabSetup'
14111411
-- type, and teach all of the code paths how to handle it.
@@ -3483,7 +3483,7 @@ setupHsConfigureFlags (ReadyPackage elab@ElaboratedConfiguredPackage{..})
34833483
-- So for now, let's pass the rather harmless and idempotent
34843484
-- `-hide-all-packages` flag to all invocations (which has
34853485
-- the benefit that every GHC invocation starts with a
3486-
-- conistently well-defined clean slate) until we find a
3486+
-- consistently well-defined clean slate) until we find a
34873487
-- better way.
34883488
= Map.toList $
34893489
Map.insertWith (++) "ghc" ["-hide-all-packages"]

changelog.d/pr-7349

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
synopsis: Add language extensions for GHC 9.2
22
pr: #7349
33
issues: #7312
4-
decription: { Add support for new language extensions added in 9.2 }
4+
description: { Add support for new language extensions added in 9.2 }

changelog.d/pr-7407

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
synopsis: --dry-run and --only-download effect v2-configure, v2-freeze, v2-run, and v2-exec
22
pr: #7407
33
issues: #7379
4-
decription: { v2-configure, v2-freeze, v2-run, and v2-exec now behave expectedly under the --dry-run and --only-download flags }
4+
description: { v2-configure, v2-freeze, v2-run, and v2-exec now behave expectedly under the --dry-run and --only-download flags }

0 commit comments

Comments
 (0)