Revert "Generate Typeable info at definition sites"

This reverts commit bef2f03e4d56d88a7e9752a7afd6a0a35616da6c.

This merge was botched

Also reverts haddock submodule.

7 files changed, 5 insertions, 176 deletions

diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr
index a4beb6454d..d9f9943d63 100644
--- a/testsuite/tests/roles/should_compile/Roles1.stderr
+++ b/testsuite/tests/roles/should_compile/Roles1.stderr
@@ -21,65 +21,4 @@ Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
-Roles1.$tcT7
-  = TyCon
-      12795488517584970699##
-      6852268802866176810##
-      Roles1.$trModule
-      (TrNameS "T7"#)
-Roles1.$tcT6
-  = TyCon
-      1052116432298682626##
-      4782516991847719023##
-      Roles1.$trModule
-      (TrNameS "T6"#)
-Roles1.$tcT5
-  = TyCon
-      10855726709479635304##
-      5574528370049939204##
-      Roles1.$trModule
-      (TrNameS "T5"#)
-Roles1.$tc'K5
-  = TyCon
-      17986294396600628264##
-      15784122741796850983##
-      Roles1.$trModule
-      (TrNameS "'K5"#)
-Roles1.$tcT4
-  = TyCon
-      5809060867006837344##
-      8795972313583150301##
-      Roles1.$trModule
-      (TrNameS "T4"#)
-Roles1.$tcT3
-  = TyCon
-      17827258502042208248##
-      10404219359416482652##
-      Roles1.$trModule
-      (TrNameS "T3"#)
-Roles1.$tcT2
-  = TyCon
-      14324923875690440398##
-      17626224477681351106##
-      Roles1.$trModule
-      (TrNameS "T2"#)
-Roles1.$tc'K2
-  = TyCon
-      17795591238510508397##
-      10155757471958311507##
-      Roles1.$trModule
-      (TrNameS "'K2"#)
-Roles1.$tcT1
-  = TyCon
-      12633763300352597178##
-      11103726621424210926##
-      Roles1.$trModule
-      (TrNameS "T1"#)
-Roles1.$tc'K1
-  = TyCon
-      1949157551035372857##
-      3576433963139282451##
-      Roles1.$trModule
-      (TrNameS "'K1"#)
-Roles1.$trModule = Module (TrNameS "main"#) (TrNameS "Roles1"#)
 
diff --git a/testsuite/tests/roles/should_compile/Roles13.stderr b/testsuite/tests/roles/should_compile/Roles13.stderr
index 4b7b2cb18d..5ecdd16e10 100644
--- a/testsuite/tests/roles/should_compile/Roles13.stderr
+++ b/testsuite/tests/roles/should_compile/Roles13.stderr
@@ -1,62 +1,17 @@
 
 ==================== Tidy Core ====================
-Result size of Tidy Core = {terms: 42, types: 18, coercions: 5}
-
--- RHS size: {terms: 2, types: 0, coercions: 0}
-a :: TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
-a = TrNameS "main"#
-
--- RHS size: {terms: 2, types: 0, coercions: 0}
-a1 :: TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
-a1 = TrNameS "Roles13"#
-
--- RHS size: {terms: 3, types: 0, coercions: 0}
-Roles13.$trModule :: Module
-[GblId[ReflectionId], Caf=NoCafRefs, Str=DmdType]
-Roles13.$trModule = Module a a1
-
--- RHS size: {terms: 2, types: 0, coercions: 0}
-a2 :: TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
-a2 = TrNameS "Age"#
-
--- RHS size: {terms: 5, types: 0, coercions: 0}
-Roles13.$tcAge :: TyCon
-[GblId[ReflectionId], Caf=NoCafRefs, Str=DmdType]
-Roles13.$tcAge = TyCon 0## 0## Roles13.$trModule a2
-
--- RHS size: {terms: 2, types: 0, coercions: 0}
-a3 :: TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
-a3 = TrNameS "'MkWrap"#
-
--- RHS size: {terms: 5, types: 0, coercions: 0}
-Roles13.$tc'MkWrap :: TyCon
-[GblId[ReflectionId], Caf=NoCafRefs, Str=DmdType]
-Roles13.$tc'MkWrap = TyCon 0## 0## Roles13.$trModule a3
-
--- RHS size: {terms: 2, types: 0, coercions: 0}
-a4 :: TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
-a4 = TrNameS "Wrap"#
-
--- RHS size: {terms: 5, types: 0, coercions: 0}
-Roles13.$tcWrap :: TyCon
-[GblId[ReflectionId], Caf=NoCafRefs, Str=DmdType]
-Roles13.$tcWrap = TyCon 0## 0## Roles13.$trModule a4
+Result size of Tidy Core = {terms: 5, types: 9, coercions: 5}
 
 -- RHS size: {terms: 2, types: 2, coercions: 0}
-a5 :: Wrap Age -> Wrap Age
+a :: Wrap Age -> Wrap Age
 [GblId, Arity=1, Caf=NoCafRefs, Str=DmdType]
-a5 = \ (ds :: Wrap Age) -> ds
+a = \ (ds :: Wrap Age) -> ds
 
 -- RHS size: {terms: 1, types: 0, coercions: 5}
 convert :: Wrap Age -> Int
 [GblId, Arity=1, Caf=NoCafRefs, Str=DmdType]
 convert =
-  a5
+  a
   `cast` (<Wrap Age>_R -> Roles13.NTCo:Wrap[0] Roles13.NTCo:Age[0]
           :: (Wrap Age -> Wrap Age) ~R# (Wrap Age -> Int))
 
diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr
index 20c0bfe7a4..bb61133ce0 100644
--- a/testsuite/tests/roles/should_compile/Roles14.stderr
+++ b/testsuite/tests/roles/should_compile/Roles14.stderr
@@ -11,11 +11,4 @@ Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
-Roles12.$tcC2
-  = TyCon
-      4006088231579841122##
-      4783761708993822739##
-      Roles12.$trModule
-      (TrNameS "C2"#)
-Roles12.$trModule = Module (TrNameS "main"#) (TrNameS "Roles12"#)
 
diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr
index 35895a8ae4..d07314379f 100644
--- a/testsuite/tests/roles/should_compile/Roles2.stderr
+++ b/testsuite/tests/roles/should_compile/Roles2.stderr
@@ -9,17 +9,4 @@ Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
-Roles2.$tcT2
-  = TyCon
-      5934726586329293381##
-      1923031187495159753##
-      Roles2.$trModule
-      (TrNameS "T2"#)
-Roles2.$tcT1
-  = TyCon
-      13879106829711353992##
-      15151456821588362072##
-      Roles2.$trModule
-      (TrNameS "T1"#)
-Roles2.$trModule = Module (TrNameS "main"#) (TrNameS "Roles2"#)
 
diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr
index 483b349907..6f25b63691 100644
--- a/testsuite/tests/roles/should_compile/Roles3.stderr
+++ b/testsuite/tests/roles/should_compile/Roles3.stderr
@@ -26,29 +26,4 @@ Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
-Roles3.$tcC4
-  = TyCon
-      12861862461396457184##
-      6389612623460961504##
-      Roles3.$trModule
-      (TrNameS "C4"#)
-Roles3.$tcC3
-  = TyCon
-      5998139369941479154##
-      6816352641934636458##
-      Roles3.$trModule
-      (TrNameS "C3"#)
-Roles3.$tcC2
-  = TyCon
-      8833962732139387711##
-      7891126688522429937##
-      Roles3.$trModule
-      (TrNameS "C2"#)
-Roles3.$tcC1
-  = TyCon
-      16242970448469140073##
-      10229725431456576413##
-      Roles3.$trModule
-      (TrNameS "C1"#)
-Roles3.$trModule = Module (TrNameS "main"#) (TrNameS "Roles3"#)
 
diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr
index 2c19dd29d5..0113869e42 100644
--- a/testsuite/tests/roles/should_compile/Roles4.stderr
+++ b/testsuite/tests/roles/should_compile/Roles4.stderr
@@ -15,17 +15,4 @@ Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
-Roles4.$tcC3
-  = TyCon
-      16502190608089501863##
-      13971441568961069854##
-      Roles4.$trModule
-      (TrNameS "C3"#)
-Roles4.$tcC1
-  = TyCon
-      11951908835899020229##
-      6518430686554778113##
-      Roles4.$trModule
-      (TrNameS "C1"#)
-Roles4.$trModule = Module (TrNameS "main"#) (TrNameS "Roles4"#)
 
diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr
index c62d9c43dc..87c3c0058e 100644
--- a/testsuite/tests/roles/should_compile/T8958.stderr
+++ b/testsuite/tests/roles/should_compile/T8958.stderr
@@ -1,5 +1,5 @@
 
-T8958.hs:1:31: warning:
+T8958.hs:1:31: Warning:
     -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 TYPE SIGNATURES
 TYPE CONSTRUCTORS
@@ -20,13 +20,6 @@ Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
-T8958.$tcMap = TyCon 0## 0## T8958.$trModule (TrNameS "Map"#)
-T8958.$tc'MkMap = TyCon 0## 0## T8958.$trModule (TrNameS "'MkMap"#)
-T8958.$tcRepresentational
-  = TyCon 0## 0## T8958.$trModule (TrNameS "Representational"#)
-T8958.$tcNominal
-  = TyCon 0## 0## T8958.$trModule (TrNameS "Nominal"#)
-T8958.$trModule = Module (TrNameS "main"#) (TrNameS "T8958"#)
 AbsBinds [a] []
   {Exports: [T8958.$fRepresentationala <= $dRepresentational
                <>]