Skip to content

Commit b1f59dd

Browse files
committed
Fix whitespace violations
1 parent 5af0c44 commit b1f59dd

File tree

96 files changed

+367
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+367
-373
lines changed

.gitlab/ci.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR/toolchain"
88
export CABAL_DIR="$CI_PROJECT_DIR/cabal"
99

1010
case "$(uname)" in
11-
MSYS_*|MINGW*)
12-
export CABAL_DIR="$(cygpath -w "$CABAL_DIR")"
13-
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin"
14-
EXE_EXT=".exe"
15-
;;
16-
*)
17-
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin"
18-
EXE_EXT=""
19-
;;
11+
MSYS_*|MINGW*)
12+
export CABAL_DIR="$(cygpath -w "$CABAL_DIR")"
13+
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin"
14+
EXE_EXT=".exe"
15+
;;
16+
*)
17+
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin"
18+
EXE_EXT=""
19+
;;
2020
esac
2121

2222
mkdir -p "$CABAL_DIR"
@@ -32,19 +32,19 @@ export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
3232
# for some reason the subshell doesn't pick up the arm64 environment on darwin
3333
# and starts installing x86_64 GHC
3434
case "$(uname -s)" in
35-
"Darwin"|"darwin")
36-
case "$(/usr/bin/arch)" in
37-
aarch64|arm64|armv8l)
38-
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | arch -arm64 /bin/bash
39-
;;
40-
*)
41-
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
42-
;;
43-
esac
44-
;;
45-
*)
46-
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
47-
;;
35+
"Darwin"|"darwin")
36+
case "$(/usr/bin/arch)" in
37+
aarch64|arm64|armv8l)
38+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | arch -arm64 /bin/bash
39+
;;
40+
*)
41+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
42+
;;
43+
esac
44+
;;
45+
*)
46+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
47+
;;
4848
esac
4949

5050
# https://github.com/haskell/cabal/issues/7313#issuecomment-811851884

Cabal-syntax/src/Distribution/Backpack.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ data OpenUnitId
9898
-- TODO: cache holes?
9999

100100
instance Binary OpenUnitId
101-
instance Structured OpenUnitId
101+
instance Structured OpenUnitId
102102
instance NFData OpenUnitId where
103103
rnf (IndefFullUnitId cid subst) = rnf cid `seq` rnf subst
104104
rnf (DefiniteUnitId uid) = rnf uid

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import qualified Distribution.Fields.Parser as P
3434
import qualified Data.ByteString as BS
3535
import qualified Text.PrettyPrint as PP
3636

37-
-- | This type is used to discern when a comment block should go
37+
-- | This type is used to discern when a comment block should go
3838
-- before or after a cabal-like file field, otherwise it would
3939
-- be hardcoded to a single position. It is often used in
4040
-- conjunction with @PrettyField@.
@@ -153,7 +153,7 @@ renderField (Opts rann indent post) fw (PrettyField ann name doc) =
153153
narrowStyle = PP.style { PP.lineLength = PP.lineLength PP.style - fw }
154154

155155
renderField opts@(Opts rann indent post) _ (PrettySection ann name args fields) = Block Margin Margin $
156-
156+
157157
attachComments
158158
(post ann [ PP.render $ PP.hsep $ PP.text (fromUTF8BS name) : args ])
159159
++

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import qualified Text.PrettyPrint as Disp
2929
-- LicenseExceptionId
3030
-------------------------------------------------------------------------------
3131

32-
-- | SPDX License Exceptions identifiers list v3.16
32+
-- | SPDX License Exceptions identifiers list v3.16
3333
data LicenseExceptionId
3434
= DS389_exception -- ^ @389-exception@, 389 Directory Server Exception
3535
| Autoconf_exception_2_0 -- ^ @Autoconf-exception-2.0@, Autoconf exception 2.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import qualified Text.PrettyPrint as Disp
3232
-- LicenseId
3333
-------------------------------------------------------------------------------
3434

35-
-- | SPDX License identifiers list v3.16
35+
-- | SPDX License identifiers list v3.16
3636
data LicenseId
3737
= NullBSD -- ^ @0BSD@, BSD Zero Clause License
3838
| AAL -- ^ @AAL@, Attribution Assurance License

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@ foldCondTree e u mergeInclusive mergeExclusive = goTree
198198
goTree :: CondTree v c a -> b
199199
goTree (CondNode a c ifs) = u (c, a) `mergeInclusive` foldl goBranch e ifs
200200
goBranch :: b -> CondBranch v c a -> b
201-
goBranch acc (CondBranch _ t mt) = mergeInclusive acc (maybe (goTree t) (mergeExclusive (goTree t) . goTree) mt)
201+
goBranch acc (CondBranch _ t mt) = mergeInclusive acc (maybe (goTree t) (mergeExclusive (goTree t) . goTree) mt)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ instance Pretty ExeDependency where
3737
pver | isAnyVersion ver = PP.empty
3838
| otherwise = pretty ver
3939

40-
-- |
40+
-- |
4141
--
4242
-- Examples
4343
--

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ instance NFData LibraryName where rnf = genericRnf
3535
--
3636
-- /Note:/ there are no 'Pretty' or 'Parsec' instances,
3737
-- as there's other way to represent 'LibraryName', namely as bare
38-
-- 'UnqualComponentName'.
38+
-- 'UnqualComponentName'.
3939
prettyLibraryNameComponent :: LibraryName -> Disp.Doc
4040
prettyLibraryNameComponent LMainLibName = Disp.text "lib"
4141
prettyLibraryNameComponent (LSubLibName str) = Disp.text "lib:" <<>> pretty str

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ versionGuardMultilibs = do
7878
]
7979

8080
-- | Smart constructor of 'Mixin', enforces invariant.
81-
--
81+
--
8282
-- @since 3.4.0.0
8383
mkMixin :: PackageName -> LibraryName -> IncludeRenaming -> Mixin
8484
mkMixin pn (LSubLibName uqn) incl

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,3 @@ isDigit8 w = 0x30 <= w && w <= 0x39
116116
isAlpha8 :: Word8 -> Bool
117117
isAlpha8 w = (0x41 <= w && w <= 0x5A) || (0x61 <= w && w <= 0x7A)
118118

119-

Cabal-syntax/src/Distribution/Utils/Generic.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ validateUTF8 = go 0 where
237237
Just (cn, bs') | cn .&. 0xC0 == 0x80 ->
238238
moreBytes (off + 1) (byteCount-1) overlong bs' ((acc `shiftL` 6) .|. fromIntegral cn .&. 0x3F)
239239
_ -> Just off
240-
240+
241241

242242
-- | Ignore a Unicode byte order mark (BOM) at the beginning of the input
243243
--

Cabal-tests/tests/ParserTests/errors/leading-comma-2c.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ library
88
default-language: Haskell2010
99
exposed-modules:
1010
LeadingComma, MixedComma NoComma
11-
11+
1212

1313
build-depends: base, containers
1414

Cabal-tests/tests/ParserTests/regressions/cc-options-with-optimization.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ maintainer: [email protected]
66
name: cxx-options-with-optimization
77
synopsis: test a build check
88
version: 1
9-
9+
1010
library
1111
build-depends: base >= 4.9 && <4.10
1212
cc-options: -O2

Cabal-tests/tests/ParserTests/regressions/cxx-options-with-optimization.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ maintainer: [email protected]
66
name: cxx-options-with-optimization
77
synopsis: test a build check
88
version: 1
9-
9+
1010
library
1111
build-depends: base >= 4.9 && <4.10
1212
cxx-options: -O2

0 commit comments

Comments
 (0)