diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-11-07 11:50:36 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-11-07 13:13:16 -0500 |
| commit | 93b4820607aed1ab633e836084c5e39f5e631f87 (patch) | |
| tree | cd1b51c1ff088e9ff25747875bd12e963ae1ec40 /compiler/hsSyn/HsSyn.hs | |
| parent | c1bc923b08860101d0b74795ff42f6022c7fec0b (diff) | |
| download | haskell-93b4820607aed1ab633e836084c5e39f5e631f87.tar.gz | |
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.
Diffstat (limited to 'compiler/hsSyn/HsSyn.hs')
| -rw-r--r-- | compiler/hsSyn/HsSyn.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/hsSyn/HsSyn.hs b/compiler/hsSyn/HsSyn.hs index 280f5d36ce..62bfa2e5c5 100644 --- a/compiler/hsSyn/HsSyn.hs +++ b/compiler/hsSyn/HsSyn.hs @@ -15,7 +15,6 @@ therefore, is almost nothing but re-exporting. {-# LANGUAGE UndecidableInstances #-} -- Note [Pass sensitive types] -- in module PlaceHolder {-# LANGUAGE ConstraintKinds #-} -{-# LANGUAGE FlexibleInstances #-} module HsSyn ( module HsBinds, @@ -113,8 +112,8 @@ data HsModule name -- For details on above see note [Api annotations] in ApiAnnotation deriving instance (DataId name) => Data (HsModule name) -instance (SourceTextX (GhcPass p), OutputableBndrId (GhcPass p)) - => Outputable (HsModule (GhcPass p)) where +instance (SourceTextX pass, OutputableBndrId pass) + => Outputable (HsModule pass) where ppr (HsModule Nothing _ imports decls _ mbDoc) = pp_mb mbDoc $$ pp_nonnull imports |