[commit: ghc] wip/spj-wildcard-refactor: Wibbles (88a67a3)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/88a67a3992d3b8fa6de9f45a52b038b50f480789/ghc

>---------------------------------------------------------------

commit 88a67a3992d3b8fa6de9f45a52b038b50f480789
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 12:16:51 2015 +0000

    Wibbles


>---------------------------------------------------------------

88a67a3992d3b8fa6de9f45a52b038b50f480789
 compiler/parser/Parser.y    | 2 +-
 compiler/parser/RdrHsSyn.hs | 2 +-
 compiler/rename/RnExpr.hs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 49dde76..7fe54ae 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -1880,7 +1880,7 @@ gadt_constr :: { LConDecl RdrName }
     -- see Note [Difference in parsing GADT and data constructors]
     -- Returns a list because of:   C,D :: ty
         : con_list '::' ctype
-                     {% let { (anns,gadtDecl) = mkGadtDecl (unLoc $1) $3 }
+                {% do { let { (anns,gadtDecl) = mkGadtDecl (unLoc $1) $3 }
                       ; ams (sLL $1 $> gadtDecl)
                             (mj AnnDcolon $2:anns) } }
 
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 927d6d8..2f48288 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -913,7 +913,7 @@ checkFunBind msg ann lhs_loc fun is_infix pats opt_sig (L rhs_span grhss)
         let match_span = combineSrcSpans lhs_loc rhs_span
         -- Add back the annotations stripped from any HsPar values in the lhs
         -- mapM_ (\a -> a match_span) ann
-        return (ann,makeFunBind fun is_infix
+        return (ann, makeFunBind fun
                   [L match_span (Match { m_fixity = FunBindMatch fun is_infix
                                        , m_pats = ps
                                        , m_type = opt_sig
diff --git a/compiler/rename/RnExpr.hs b/compiler/rename/RnExpr.hs
index b9c6d54..cfd012d 100644
--- a/compiler/rename/RnExpr.hs
+++ b/compiler/rename/RnExpr.hs
@@ -251,7 +251,7 @@ rnExpr (ExplicitTuple tup_args boxity)
     rnTupArg (L l (Missing _)) = return (L l (Missing placeHolderType)
                                         , emptyFVs)
 
-rnExpr (RecordCon con_id _ rec_binds@(HsRecFields { rec_dotdot = dd } _))
+rnExpr (RecordCon con_id _ rec_binds@(HsRecFields { rec_dotdot = dd }) _)
   = do { con_lname@(L _ con_name) <- lookupLocatedOccRn con_id
        ; (flds, fvs)   <- rnHsRecFields (HsRecFieldCon con_name) HsVar rec_binds
        ; (flds', fvss) <- mapAndUnzipM rn_field flds