[commit: ghc] ghc-8.0: White space only (ff333a4)

git at git.haskell.org git at git.haskell.org
Mon Jan 18 13:05:34 UTC 2016


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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff333a45c2bad9d61927204fecf1ab3396b20acd/ghc

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

commit ff333a45c2bad9d61927204fecf1ab3396b20acd
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Jan 11 09:02:01 2016 +0000

    White space only
    
    (cherry picked from commit b7e5c302173f420780a1fdc8b599549298d286c3)


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

ff333a45c2bad9d61927204fecf1ab3396b20acd
 compiler/typecheck/TcDeriv.hs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/compiler/typecheck/TcDeriv.hs b/compiler/typecheck/TcDeriv.hs
index e351f28..c790956 100644
--- a/compiler/typecheck/TcDeriv.hs
+++ b/compiler/typecheck/TcDeriv.hs
@@ -1567,18 +1567,15 @@ mkNewTypeEqn dflags overlap_mode tvs
                 -- we are gong to get all the methods for the newtype
                 -- dictionary
 
-
         -- Next we figure out what superclass dictionaries to use
         -- See Note [Newtype deriving superclasses] above
-
         cls_tyvars = classTyVars cls
-        dfun_tvs = tyCoVarsOfTypes inst_tys
-        inst_ty = mkTyConApp tycon tc_args
-        inst_tys = cls_tys ++ [inst_ty]
-        sc_theta =
-            mkThetaOrigin DerivOrigin TypeLevel $
-            substTheta (zipOpenTCvSubst cls_tyvars inst_tys) (classSCTheta cls)
-
+        dfun_tvs   = tyCoVarsOfTypes inst_tys
+        inst_ty    = mkTyConApp tycon tc_args
+        inst_tys   = cls_tys ++ [inst_ty]
+        sc_theta   = mkThetaOrigin DerivOrigin TypeLevel $
+                     substTheta (zipOpenTCvSubst cls_tyvars inst_tys) $
+                     classSCTheta cls
 
         -- Next we collect Coercible constraints between
         -- the Class method types, instantiated with the representation and the



More information about the ghc-commits mailing list