[commit: ghc] master: Comments and white space (1963250)

git at git.haskell.org git at git.haskell.org
Wed Dec 23 07:45:59 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/19632501654cac9d84088c69bd4291009292c5c3/ghc

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

commit 19632501654cac9d84088c69bd4291009292c5c3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 21 14:17:31 2015 +0000

    Comments and white space


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

19632501654cac9d84088c69bd4291009292c5c3
 compiler/deSugar/DsExpr.hs | 2 +-
 compiler/deSugar/DsMeta.hs | 6 +++---
 compiler/hsSyn/HsUtils.hs  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/deSugar/DsExpr.hs b/compiler/deSugar/DsExpr.hs
index 2fc3974..3b9a4cf 100644
--- a/compiler/deSugar/DsExpr.hs
+++ b/compiler/deSugar/DsExpr.hs
@@ -81,7 +81,7 @@ dsLocalBinds (HsIPBinds binds)  body = dsIPBinds  binds body
 -------------------------
 dsValBinds :: HsValBinds Id -> CoreExpr -> DsM CoreExpr
 dsValBinds (ValBindsOut binds _) body = foldrM ds_val_bind body binds
-dsValBinds (ValBindsIn  _     _) _    = panic "dsValBinds ValBindsIn"
+dsValBinds (ValBindsIn {})       _    = panic "dsValBinds ValBindsIn"
 
 -------------------------
 dsIPBinds :: HsIPBinds Id -> CoreExpr -> DsM CoreExpr
diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index 5153dd9..3035e9f 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -665,9 +665,9 @@ repBangTy ty = do
 
 repDerivs :: HsDeriving Name -> DsM (Core TH.CxtQ)
 repDerivs deriv = do
-    let clauses
-          | Just (L _ ctxt) <- deriv = ctxt
-          | otherwise                = []
+    let clauses = case deriv of
+                    Nothing         -> []
+                    Just (L _ ctxt) -> ctxt
     tys <- repList typeQTyConName
                    (rep_deriv . hsSigType)
                    clauses
diff --git a/compiler/hsSyn/HsUtils.hs b/compiler/hsSyn/HsUtils.hs
index c37785b..9e8ea9a 100644
--- a/compiler/hsSyn/HsUtils.hs
+++ b/compiler/hsSyn/HsUtils.hs
@@ -749,7 +749,7 @@ collect_out_binds :: Bool -> [(RecFlag, LHsBinds id)] -> [id]
 collect_out_binds ps = foldr (collect_binds ps . snd) []
 
 collect_binds :: Bool -> LHsBindsLR idL idR -> [idL] -> [idL]
--- Collect Ids, or Ids + patter synonyms, depending on boolean flag
+-- Collect Ids, or Ids + pattern synonyms, depending on boolean flag
 collect_binds ps binds acc = foldrBag (collect_bind ps . unLoc) acc binds
 
 collect_bind :: Bool -> HsBindLR idL idR -> [idL] -> [idL]



More information about the ghc-commits mailing list