summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorVladislav Zavialov <vlad.z.4096@gmail.com>2019-10-07 13:57:59 +0300
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-10-30 07:36:50 -0400
commit3e7569bcd4a88ba45d2c40b0904c587c2edf4972 (patch)
tree26fb12e13649adebffd4aa11fe33c51fc68ce28e /compiler
parent93ff91978be67920c7e3657c077ca14c5d6c09bc (diff)
downloadhaskell-3e7569bcd4a88ba45d2c40b0904c587c2edf4972.tar.gz
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.
Diffstat (limited to 'compiler')
-rw-r--r--compiler/typecheck/TcRnExports.hs2
-rw-r--r--compiler/utils/Dominators.hs6
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/typecheck/TcRnExports.hs b/compiler/typecheck/TcRnExports.hs
index af8ba09a65..a4ef692c58 100644
--- a/compiler/typecheck/TcRnExports.hs
+++ b/compiler/typecheck/TcRnExports.hs
@@ -269,7 +269,7 @@ exports_from_avail (Just (dL->L _ rdr_items)) rdr_env imports this_mod
-- See Note [Avails of associated data families]
expand_tyty_gre :: GlobalRdrElt -> [GlobalRdrElt]
- expand_tyty_gre (gre @ GRE { gre_name = me, gre_par = ParentIs p })
+ expand_tyty_gre (gre@GRE { gre_name = me, gre_par = ParentIs p })
| isTyConName p, isTyConName me = [gre, gre{ gre_par = NoParent }]
expand_tyty_gre gre = [gre]
diff --git a/compiler/utils/Dominators.hs b/compiler/utils/Dominators.hs
index d6d8404564..485cc75995 100644
--- a/compiler/utils/Dominators.hs
+++ b/compiler/utils/Dominators.hs
@@ -364,11 +364,11 @@ domM = fetch domE
rootM :: Dom s Node
rootM = gets rootE
succsM :: Node -> Dom s [Node]
-succsM i = gets (IS.toList . (!i) . succE)
+succsM i = gets (IS.toList . (! i) . succE)
predsM :: Node -> Dom s [Node]
-predsM i = gets (IS.toList . (!i) . predE)
+predsM i = gets (IS.toList . (! i) . predE)
bucketM :: Node -> Dom s [Node]
-bucketM i = gets (IS.toList . (!i) . bucketE)
+bucketM i = gets (IS.toList . (! i) . bucketE)
sizeM :: Node -> Dom s Int
sizeM = fetch sizeE
sdnoM :: Node -> Dom s Int