[commit: ghc] wip/orf-reboot: Minor fixes (7c15c73)

[git at git.haskell.org]

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

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/7c15c739ad9c6ede500192d6316df8463f91124e/ghc

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

commit 7c15c739ad9c6ede500192d6316df8463f91124e
Author: Adam Gundry <adam at well-typed.com>
Date:   Mon Feb 23 14:09:30 2015 +0000

    Minor fixes


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

7c15c739ad9c6ede500192d6316df8463f91124e
 compiler/typecheck/TcGenDeriv.hs   | 2 +-
 compiler/typecheck/TcTyClsDecls.hs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs
index 3764cab..366a9db 100644
--- a/compiler/typecheck/TcGenDeriv.hs
+++ b/compiler/typecheck/TcGenDeriv.hs
@@ -1357,7 +1357,7 @@ gen_Data_binds dflags loc rep_tc
                nlList  labels,                            -- Field labels
            nlHsVar fixity]                                -- Fixity
 
-        labels   = map (nlHsLit . HsString "AMG TODO" . flLabel)
+        labels   = map (nlHsLit . mkHsString . unpackFS . flLabel)
                        (dataConFieldLabels dc)
         dc_occ   = getOccName dc
         is_infix = isDataSymOcc dc_occ
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 70da3ad..1c85505 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -1164,11 +1164,10 @@ tcConDecl new_or_data rep_tycon tmpl_tvs res_tmpl        -- Data types
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsTyVarBndrs hs_tvs $ \ _ ->
               do { ctxt    <- tcHsContext hs_ctxt
-                 ; details <- tcConArgs new_or_data hs_details
+                 ; btys    <- tcConArgs new_or_data hs_details
                  ; res_ty  <- tcConRes hs_res_ty
                  ; field_lbls <- lookupConstructorFields (unLoc $ head names) -- AMG TODO ???
-                 ; let btys = details -- AMG TODO
-                       (arg_tys, stricts) = unzip btys
+                 ; let (arg_tys, stricts) = unzip btys
                  ; return (ctxt, arg_tys, res_ty, field_lbls, stricts)
                  }