[commit: ghc] master: Merge with HEAD (5673173)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5673173de699d556ef7f51a1b558bd1ec676fd52

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

commit 5673173de699d556ef7f51a1b558bd1ec676fd52
Merge: 6403540... 673b1be...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Mar 27 13:43:18 2012 +0100

    Merge with HEAD

 compiler/parser/RdrHsSyn.lhs |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --cc compiler/parser/RdrHsSyn.lhs
index 8c4ff3c,fa6a2d2..91bab6c
--- a/compiler/parser/RdrHsSyn.lhs
+++ b/compiler/parser/RdrHsSyn.lhs
@@@ -5,8 -5,8 +5,7 @@@ Functions over HsSyn specialised to Rdr
  
  \begin{code}
  module RdrHsSyn (
 -        extractHsTyRdrTyVars,
 -        extractHsRhoRdrTyVars,
 +        extractHsTyRdrTyVars, extractHsTysRdrTyVars,
-         extractGenericPatTyVars,
  
          mkHsOpApp,
          mkHsIntegral, mkHsFractional, mkHsIsString,
@@@ -75,7 -73,7 +74,7 @@@ import PrelNames        ( forall_tv_RD
  import DynFlags
  import SrcLoc
  import OrdList          ( OrdList, fromOL )
--import Bag              ( Bag, emptyBag, consBag, foldrBag )
++import Bag              ( Bag, emptyBag, consBag )
  import Outputable
  import FastString
  import Maybes
@@@ -83,7 -81,7 +82,7 @@@ import Util             ( filterOut 
  import Control.Applicative ((<$>))
  import Control.Monad
  import Text.ParserCombinators.ReadP as ReadP
- import Data.List        ( nub, nubBy )
 -import Data.List        ( nubBy, partition )
++import Data.List        ( nub )
  import Data.Char
  
  #include "HsVersions.h"
@@@ -144,20 -148,9 +143,9 @@@ extract_lty (L _ ty) ac
        HsTyLit _                 -> acc
        HsWrapTy _ _              -> panic "extract_lty"
  
 -extract_tv :: SrcSpan -> RdrName -> [Located RdrName] -> [Located RdrName]
 -extract_tv loc tv acc | isRdrTyVar tv = L loc tv : acc
 -                      | otherwise     = acc
 +extract_tv :: RdrName -> [RdrName] -> [RdrName]
 +extract_tv tv acc | isRdrTyVar tv = tv : acc
 +                  | otherwise     = acc
- 
- extractGenericPatTyVars :: LHsBinds RdrName -> [Located RdrName]
- -- Get the type variables out of the type patterns in a bunch of
- -- possibly-generic bindings in a class declaration
- extractGenericPatTyVars binds
-   = nubBy eqLocated (foldrBag get [] binds)
-   where
-     get (L _ (FunBind { fun_matches = MatchGroup ms _ })) acc = foldr (get_m.unLoc) acc ms
-     get _                                                 acc = acc
- 
-     get_m _ acc = acc
  \end{code}