From 93b4820607aed1ab633e836084c5e39f5e631f87 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 7 Nov 2017 11:50:36 -0500 Subject: Revert "WIP on combining Step 1 and 3 of Trees That Grow" This reverts commit 0ff152c9e633accca48815e26e59d1af1fe44ceb. Sadly this broke when bootstrapping with 8.0.2 due to #14396. Reverts haddock submodule. --- compiler/hsSyn/HsPat.hs-boot | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'compiler/hsSyn/HsPat.hs-boot') diff --git a/compiler/hsSyn/HsPat.hs-boot b/compiler/hsSyn/HsPat.hs-boot index 47dae434ce..8cb82ed22e 100644 --- a/compiler/hsSyn/HsPat.hs-boot +++ b/compiler/hsSyn/HsPat.hs-boot @@ -4,19 +4,17 @@ -- in module PlaceHolder {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE RoleAnnotations #-} -{-# LANGUAGE FlexibleInstances #-} module HsPat where import SrcLoc( Located ) import Data.Data hiding (Fixity) import Outputable -import HsExtension ( SourceTextX, DataId, OutputableBndrId, GhcPass ) +import HsExtension ( SourceTextX, DataId, OutputableBndrId ) type role Pat nominal data Pat (i :: *) type LPat i = Located (Pat i) instance (DataId p) => Data (Pat p) -instance (SourceTextX (GhcPass p), OutputableBndrId (GhcPass p)) - => Outputable (Pat (GhcPass p)) +instance (SourceTextX pass, OutputableBndrId pass) => Outputable (Pat pass) -- cgit v1.2.1