X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDeriv.lhs;h=0acf31c512b3274c50d445d5f65fe9af50c89ff3;hb=1c5499d4d5d506ce0cc971e98c09bfbf7bc290a1;hp=fc41c8a14abfe1c1497f40c619a8566ccfc0ae92;hpb=ec70ee9f1fb57cfbaffe7187f1bd4440903a49d7;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index fc41c8a..0acf31c 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -238,10 +238,11 @@ tcDeriving tycl_decls inst_decls deriv_decls
 	; gen_binds <- mkGenericBinds tycl_decls
 
 	-- Rename these extra bindings, discarding warnings about unused bindings etc
-	-- Set -fglasgow exts so that we can have type signatures in patterns,
-	-- which is used in the generic binds
+	-- Type signatures in patterns are used in the generic binds
 	; rn_binds
-		<- discardWarnings $ setOptM Opt_GlasgowExts $ do
+		<- discardWarnings $
+           setOptM Opt_PatternSignatures $
+           do
 			{ (rn_deriv, _dus1) <- rnTopBinds (ValBindsIn deriv_binds [])
 			; (rn_gen, dus_gen) <- rnTopBinds (ValBindsIn gen_binds   [])
 			; keepAliveSetTc (duDefs dus_gen)	-- Mark these guys to
@@ -408,7 +409,7 @@ mkEqnHelp orig tvs cls cls_tys tc_app
 		
 	; (rep_tc, rep_tc_args) <- tcLookupFamInstExact tycon full_tc_args
 
-	; mayDeriveDataTypeable <- doptM Opt_GlasgowExts
+	; mayDeriveDataTypeable <- doptM Opt_DeriveDataTypeable
 	; newtype_deriving <- doptM Opt_GeneralizedNewtypeDeriving
 	; overlap_flag <- getOverlapFlag