Skip to content

Commit

Permalink
Integrate Brandon’s review: grammar
Browse files Browse the repository at this point in the history
  • Loading branch information
ffaf1 committed Nov 9, 2023
1 parent a159353 commit e4777e6
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ On library, these packages miss upper bounds:
- alphalib
- betalib
- deltalib
Please add them. More informations at https://pvp.haskell.org/
Please add them. There is more information at https://pvp.haskell.org/
2 changes: 1 addition & 1 deletion Cabal/src/Distribution/PackageDescription/Check.hs
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ checkGlobFile cv ddir title fp = do
rs <- runDirFileGlobM po dir parsedGlob
return $ checkGlobResult title fp rs

-- | Checks for matchless globs and too strict mathching (<2.4 spec).
-- | Checks for matchless globs and too strict matching (<2.4 spec).
checkGlobResult
:: CabalField -- .cabal field we are checking
-> FilePath -- Glob pattern (to show the user
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-- Maintainer : [email protected]
-- Portability : portable
--
-- Checks on conditional targes (libraries, executables, etc. that are
-- Checks on conditional targets (libraries, executables, etc. that are
-- still inside a CondTree and related checks that can only be performed
-- here (variables, duplicated modules).
module Distribution.PackageDescription.Check.Conditional
Expand Down
12 changes: 6 additions & 6 deletions Cabal/src/Distribution/PackageDescription/Check/Warning.hs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ ppExplanation (InvalidNameWin pkg) =
++ prettyShow pkg
++ "' is "
++ "invalid on Windows. Many tools need to convert package names to "
++ "file names so using this name would cause problems."
++ "file names, so using this name would cause problems."
ppExplanation ZPrefix =
"Package names with the prefix 'z-' are reserved by Cabal and "
++ "cannot be used."
Expand Down Expand Up @@ -637,7 +637,7 @@ ppExplanation (DistPoint mfield path) =
++ " points inside the 'dist' "
++ "directory. This is not reliable because the location of this "
++ "directory is configurable by the user (or package manager). In "
++ "addition the layout of the 'dist' directory is subject to change "
++ "addition, the layout of the 'dist' directory is subject to change "
++ "in future versions of Cabal."
where
-- mfiled Nothing -> the path is inside `ghc-options`
Expand Down Expand Up @@ -841,12 +841,12 @@ ppExplanation (MissingUpperBounds ct names) =
++ separator
++ List.intercalate separator names
++ "\n"
++ "Please add them. More informations at https://pvp.haskell.org/"
++ "Please add them. There is more information at https://pvp.haskell.org/"
ppExplanation (SuspiciousFlagName invalidFlagNames) =
"Suspicious flag names: "
++ unwords invalidFlagNames
++ ". "
++ "To avoid ambiguity in command line interfaces, flag shouldn't "
++ "To avoid ambiguity in command line interfaces, a flag shouldn't "
++ "start with a dash. Also for better compatibility, flag names "
++ "shouldn't contain non-ascii characters."
ppExplanation (DeclaredUsedFlags declared used) =
Expand Down Expand Up @@ -887,7 +887,7 @@ ppExplanation (JUnneeded fieldName) =
addConditionalExp $
"'"
++ fieldName
++ ": -j[N]' can make sense for specific user's setup,"
++ ": -j[N]' can make sense for a particular user's setup,"
++ " but it is not appropriate for a distributed package."
ppExplanation (FDeferTypeErrorsUnneeded fieldName) =
addConditionalExp $
Expand Down Expand Up @@ -966,7 +966,7 @@ ppExplanation (UnknownDirectory kind dir) =
quote (kind ++ ": " ++ dir)
++ " specifies a directory which does not exist."
ppExplanation MissingSourceControl =
"When distributing packages it is encouraged to specify source "
"When distributing packages, it is encouraged to specify source "
++ "control information in the .cabal file using one or more "
++ "'source-repository' sections. See the Cabal user guide for "
++ "details."
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cabal check
The following errors will cause portability problems on other environments:
Error: 'ghc-options' path 'dist/file' points inside the 'dist' directory. This is not reliable because the location of this directory is configurable by the user (or package manager). In addition the layout of the 'dist' directory is subject to change in future versions of Cabal.
Error: 'ghc-options' path 'dist/file' points inside the 'dist' directory. This is not reliable because the location of this directory is configurable by the user (or package manager). In addition, the layout of the 'dist' directory is subject to change in future versions of Cabal.
Error: Hackage would reject this package.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cabal check
The following errors will cause portability problems on other environments:
Error: 'ghc-options: -j[N]' can make sense for specific user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development.
Error: 'ghc-options: -j[N]' can make sense for a particular user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development.
Error: Hackage would reject this package.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cabal check
The following errors will cause portability problems on other environments:
Error: 'ghc-shared-options: -j[N]' can make sense for specific user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development.
Error: 'ghc-shared-options: -j[N]' can make sense for a particular user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development.
Error: Hackage would reject this package.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
These warnings may cause trouble when distributing the package:
Warning: On executable 'prova', these packages miss upper bounds:
- acme-box
Please add them. More informations at https://pvp.haskell.org/
Please add them. There is more information at https://pvp.haskell.org/
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
These warnings may cause trouble when distributing the package:
Warning: On library 'int-lib', these packages miss upper bounds:
- text
Please add them. More informations at https://pvp.haskell.org/
Please add them. There is more information at https://pvp.haskell.org/
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# cabal check
These warnings will likely cause trouble when distributing the package:
Warning: When distributing packages it is encouraged to specify source control information in the .cabal file using one or more 'source-repository' sections. See the Cabal user guide for details.
Warning: When distributing packages, it is encouraged to specify source control information in the .cabal file using one or more 'source-repository' sections. See the Cabal user guide for details.

0 comments on commit e4777e6

Please sign in to comment.