Whitespace forward compatibility for proposal #229

GHC Proposal #229 changes the lexical rules of Haskell, which may
require slight whitespace adjustments in certain cases.

This patch changes formatting in a few places in GHC and its testsuite
in a way that enables it to compile under the proposed rules.
22 jobs for !2048 with wip/marge_bot_batch_merge_job in 1032 minutes and 20 seconds (queued for 3 seconds)
detached
Status Job ID Name Coverage
  Lint
passed #189032
lint
ghc-linters

00:00:16

passed #189033
lint
lint-linters

00:00:15

passed #189036
lint
lint-submods-marge

00:00:15

passed #189034
lint
lint-testsuite

00:00:15

passed #189035
lint
typecheck-testsuite

00:00:14

 
  Quick Build
passed #189037
x86_64-linux
hadrian-ghc-in-ghci

00:17:17

 
  Build
passed #189040
x86_64-linux
release-x86_64-linux-deb9-dwarf

01:56:35

passed #189039
x86_64-linux
validate-x86_64-linux-deb9-debug

04:24:05

passed #189038
x86_64-linux
validate-x86_64-linux-deb9-hadrian

03:13:01

 
  Full Build
failed #189043
aarch64-linux allowed to fail
validate-aarch64-linux-deb9

03:41:14

failed #189044
armv7-linux allowed to fail
validate-armv7-linux-deb9

12:00:00

passed #189045
x86_64-linux
validate-i386-linux-deb9

01:27:39

passed #189042
x86_64-darwin
validate-x86_64-darwin

00:59:07

passed #189046
x86_64-linux
validate-x86_64-linux-deb9-integer-simple

01:55:12

passed #189041
x86_64-linux
validate-x86_64-linux-deb9-unreg-hadrian

03:52:49

passed #189047
x86_64-linux
validate-x86_64-linux-fedora27

01:58:33

failed #189049
x86_64-windows allowed to fail
validate-x86_64-windows

00:08:08

failed #189048
x86_64-windows allowed to fail
validate-x86_64-windows-hadrian

00:47:59

 
  Cleanup
passed #189050
x86_64-darwin
cleanup-darwin

00:00:06

 
  Packaging
failed #189051
x86_64-linux allowed to fail
doc-tarball

00:00:32

 
  Testing
manual #189052
x86_64-linux allowed to fail manual
hackage
passed #189053
x86_64-linux
perf-nofib

00:29:28

 
Name Stage Failure
failed
validate-x86_64-windows Full Build
Runtime platform                                    arch=amd64 os=windows pid=3672 revision=1f513601 version=11.10.1
WARNING: $BIN_DIST_PREP_TAR_COMP: no matching files
WARNING: junit.xml: no matching files
ERROR: No files to upload
Uploading artifacts...
Runtime platform
arch=amd64 os=windows pid=4860 revision=1f513601 version=11.10.1
WARNING: junit.xml: no matching files
ERROR: No files to upload
ERROR: Job failed: exit status 2
failed
validate-armv7-linux-deb9 Full Build The script exceeded the maximum execution time set for the job
=====> T12962(prof) 4103 of 7271 [0, 51, 15]
cd "profiling/should_run/T12962.run" && "/builds/ghc/ghc/inplace/bin/ghc-stage2" -o T12962 T12962.hs -dcore-lint -dstg-lint -dcmm-lint -no-user-package-db -rtsopts -fno-warn-missed-specialisations -fshow-warning-groups -fdiagnostics-color=never -fno-diagnostics-show-caret -Werror=compat -dno-debug-output -prof -static -fprof-auto -fasm <
cd "profiling/should_run/T11627a.run" && "/builds/ghc/ghc/inplace/bin/hp2ps" T11627a<
=====> T11627a(prof_hr) 4103 of 7271 [0, 51, 15]
cd "profiling/should_run/T11627a.run" && "/builds/ghc/ghc/inplace/bin/ghc-stage2" -o T11627a T11627a.hs -dcore-lint -dstg-lint -dcmm-lint -no-user-package-db -rtsopts -fno-warn-missed-specialisations -fshow-warning-groups -fdiagnostics-color=never -fno-diagnostics-show-caret -Werror=compat -dno-debug-output -O -prof -static -fprof-auto <
cd "profiling/should_run/T12962.run" && ./T12962 +RTS -p -RTS <
=====> T12962(ghci-ext-prof) 4103 of 7271 [0, 51, 15]
cd "profiling/should_run/T12962.run" && "/builds/ghc/ghc/inplace/bin/ghc-stage2" T12962.hs -dcore-lint -dstg-lint -dcmm-lint -no-user-package-db -rtsopts -fno-warn-missed-specialisations -fshow-warning-groups -fdiagnostics-color=never -fno-diagnostics-show-caret -Werror=compat -dno-debug-output --interactive -v0 -ignore-dot-ghci -fno-ghci-history -fexternal-interpreter -prof +RTS -I0.1 -RTS < T12962.genscript
Pulling docker image gitlab/gitlab-runner-helper:arm-7137fd54 ...
ERROR: Job failed: execution took longer than 12h0m0s seconds
failed
validate-aarch64-linux-deb9 Full Build
Uploading artifacts...
ghc-aarch64-linux-deb9.tar.xz: found 1 matching files
junit.xml: found 1 matching files

performance-metrics.tsv: found 1 matching files

Uploading artifacts to coordinator... ok
id=189043 responseStatus=201 Created token=-dsPGySe
Uploading artifacts...
junit.xml: found 1 matching files

Uploading artifacts to coordinator... ok
id=189043 responseStatus=201 Created token=-dsPGySe
ERROR: Job failed: exit code 1
failed
doc-tarball Packaging
$ git submodule update --init --recursive
Submodule path 'utils/haddock': checked out 'fad111e9d3de1a2e86837d3e6f72fe0cf2f6c0ac'
$ git checkout .gitmodules
$ git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/perf || true
From https://gitlab.haskell.org/ghc/ghc-performance-notes
a95b9d646d..dabe27ca76 refs/notes/perf -> refs/notes/perf
$ if [ ! -f "$LINUX_BINDIST" ]; then # collapsed multi-line command
Error: ghc-x86_64-mingw32.tar.xz does not exist. Did the 64-bit Windows job fail?
ERROR: Job failed: exit code 1
failed
validate-x86_64-windows-hadrian Full Build
Runtime platform                                    arch=amd64 os=windows pid=4064 revision=1f513601 version=11.10.1
WARNING: ghc.tar.xz: no matching files
WARNING: junit.xml: no matching files
ERROR: No files to upload
Uploading artifacts...
Runtime platform
arch=amd64 os=windows pid=3524 revision=1f513601 version=11.10.1
WARNING: junit.xml: no matching files
ERROR: No files to upload
ERROR: Job failed: exit status 1