diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2017-01-25 23:51:32 -0500 |
|---|---|---|
| committer | Ryan Scott <ryan.gl.scott@gmail.com> | 2017-01-25 23:51:59 -0500 |
| commit | 88a89b761ae37c38c190779b64e97bdd8cc10253 (patch) | |
| tree | 86190ae7e124f54b7fe0f3eaa5ff5aef331865d6 | |
| parent | e4ab8ba72af27cd23ecd3737b166b625190c34a5 (diff) | |
| download | haskell-88a89b761ae37c38c190779b64e97bdd8cc10253.tar.gz | |
Nix typo and redundant where-clauses
| -rw-r--r-- | compiler/basicTypes/DataCon.hs | 1 | ||||
| -rw-r--r-- | compiler/basicTypes/RdrName.hs | 1 | ||||
| -rw-r--r-- | compiler/hsSyn/HsTypes.hs | 1 | ||||
| -rw-r--r-- | compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcTyClsDecls.hs | 2 |
5 files changed, 1 insertions, 6 deletions
diff --git a/compiler/basicTypes/DataCon.hs b/compiler/basicTypes/DataCon.hs index f4cdb2159d..620aea6f95 100644 --- a/compiler/basicTypes/DataCon.hs +++ b/compiler/basicTypes/DataCon.hs @@ -1109,7 +1109,6 @@ dataConUserType (MkData { dcUnivTyVars = univ_tvs, mkFunTys theta $ mkFunTys arg_tys $ res_ty - where -- | Finds the instantiated types of the arguments required to construct a 'DataCon' representation -- NB: these INCLUDE any dictionary args diff --git a/compiler/basicTypes/RdrName.hs b/compiler/basicTypes/RdrName.hs index 1bba34d27d..321b13ab19 100644 --- a/compiler/basicTypes/RdrName.hs +++ b/compiler/basicTypes/RdrName.hs @@ -738,7 +738,6 @@ availFromGRE (GRE { gre_name = me, gre_par = parent }) NoParent | isTyConName me -> AvailTC me [me] [] | otherwise -> avail me FldParent p mb_lbl -> AvailTC p [] [mkFieldLabel me mb_lbl] - where mkFieldLabel :: Name -> Maybe FastString -> FieldLabel mkFieldLabel me mb_lbl = diff --git a/compiler/hsSyn/HsTypes.hs b/compiler/hsSyn/HsTypes.hs index 7dd34918b1..c974d1f3bc 100644 --- a/compiler/hsSyn/HsTypes.hs +++ b/compiler/hsSyn/HsTypes.hs @@ -1053,7 +1053,6 @@ splitLHsInstDeclTy (HsIB { hsib_vars = itkvs = (itkvs ++ map hsLTyVarName tvs, cxt, body_ty) -- Return implicitly bound type and kind vars -- For an instance decl, all of them are in scope - where getLHsInstDeclHead :: LHsSigType name -> LHsType name getLHsInstDeclHead inst_ty diff --git a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs index a7085588e9..a0e86f14c4 100644 --- a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs +++ b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs @@ -234,8 +234,6 @@ getRegister (CmmMachOp mop [x, y]) MO_S_Shr rep -> trivialCode rep SRA x y _ -> pprPanic "getRegister(sparc) - binary CmmMachOp (1)" (pprMachOp mop) - where - getRegister (CmmLoad mem pk) = do Amode src code <- getAmode mem diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs index e790a11405..d3e308fac0 100644 --- a/compiler/typecheck/TcTyClsDecls.hs +++ b/compiler/typecheck/TcTyClsDecls.hs @@ -324,7 +324,7 @@ See also Note [Kind checking recursive type and class declarations] kcTyClGroup :: [LTyClDecl Name] -> TcM [TcTyCon] -- Kind check this group, kind generalize, and return the resulting local env --- This bindds the TyCons and Classes of the group, but not the DataCons +-- This binds the TyCons and Classes of the group, but not the DataCons -- See Note [Kind checking for type and class decls] -- Third return value is Nothing if the tycon be unsaturated; otherwise, -- the arity |