Unit: split and rename modules

Introduce GHC.Unit.* hierarchy for everything concerning units, packages
and modules.

Update Haddock submodule

6 files changed, 76 insertions, 191 deletions

diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr
index defc6e8c3a..e4f1683ee9 100644
--- a/testsuite/tests/roles/should_compile/Roles1.stderr
+++ b/testsuite/tests/roles/should_compile/Roles1.stderr
@@ -20,122 +20,66 @@ DATA CONSTRUCTORS
   K2 :: forall a. a -> T2 a
   K1 :: forall a. a -> T1 a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles1.$tcT7
   = GHC.Types.TyCon
-      178606230775360129##
-      14564382578551945561##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T7"#)
-      1
-      $krep
+      178606230775360129## 14564382578551945561## Roles1.$trModule
+      (GHC.Types.TrNameS "T7"#) 1 $krep
 Roles1.$tc'K7
   = GHC.Types.TyCon
-      15901479081375327280##
-      4842873210599704617##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K7"#)
-      3
-      $krep
+      15901479081375327280## 4842873210599704617## Roles1.$trModule
+      (GHC.Types.TrNameS "'K7"#) 3 $krep
 Roles1.$tcT6
   = GHC.Types.TyCon
-      7244893995195634045##
-      6882827069359931041##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T6"#)
-      1
-      $krep
+      7244893995195634045## 6882827069359931041## Roles1.$trModule
+      (GHC.Types.TrNameS "T6"#) 1 $krep
 Roles1.$tc'K6
   = GHC.Types.TyCon
-      13928703131159360198##
-      9274401506945696896##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K6"#)
-      2
-      $krep
+      13928703131159360198## 9274401506945696896## Roles1.$trModule
+      (GHC.Types.TrNameS "'K6"#) 2 $krep
 Roles1.$tcT5
   = GHC.Types.TyCon
-      12033401645911719002##
-      6369139038321702301##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T5"#)
-      0
-      GHC.Types.krep$*Arr*
+      12033401645911719002## 6369139038321702301## Roles1.$trModule
+      (GHC.Types.TrNameS "T5"#) 0 GHC.Types.krep$*Arr*
 Roles1.$tc'K5
   = GHC.Types.TyCon
-      5548842497263642061##
-      18349261927117571882##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K5"#)
-      1
-      $krep
+      5548842497263642061## 18349261927117571882## Roles1.$trModule
+      (GHC.Types.TrNameS "'K5"#) 1 $krep
 Roles1.$tcT4
   = GHC.Types.TyCon
-      15834077582937152787##
-      17059037094835388922##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T4"#)
-      0
-      $krep
+      15834077582937152787## 17059037094835388922## Roles1.$trModule
+      (GHC.Types.TrNameS "T4"#) 0 $krep
 Roles1.$tc'K4
   = GHC.Types.TyCon
-      10188453925450404995##
-      4762093850599364042##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K4"#)
-      2
-      $krep
+      10188453925450404995## 4762093850599364042## Roles1.$trModule
+      (GHC.Types.TrNameS "'K4"#) 2 $krep
 Roles1.$tcT3
   = GHC.Types.TyCon
-      13341737262627465733##
-      14527452670364737316##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T3"#)
-      1
-      $krep
+      13341737262627465733## 14527452670364737316## Roles1.$trModule
+      (GHC.Types.TrNameS "T3"#) 1 $krep
 Roles1.$tc'K3
   = GHC.Types.TyCon
-      14534968069054730342##
-      6860808298964464185##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K3"#)
-      2
-      $krep
+      14534968069054730342## 6860808298964464185## Roles1.$trModule
+      (GHC.Types.TrNameS "'K3"#) 2 $krep
 Roles1.$tcT2
   = GHC.Types.TyCon
-      12900773996789723956##
-      9313087549503346504##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T2"#)
-      0
-      GHC.Types.krep$*Arr*
+      12900773996789723956## 9313087549503346504## Roles1.$trModule
+      (GHC.Types.TrNameS "T2"#) 0 GHC.Types.krep$*Arr*
 Roles1.$tc'K2
   = GHC.Types.TyCon
-      11054915488163123841##
-      10799789256744079155##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K2"#)
-      1
-      $krep
+      11054915488163123841## 10799789256744079155## Roles1.$trModule
+      (GHC.Types.TrNameS "'K2"#) 1 $krep
 Roles1.$tcT1
   = GHC.Types.TyCon
-      13228660854624297872##
-      14494320157476678712##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T1"#)
-      0
-      GHC.Types.krep$*Arr*
+      13228660854624297872## 14494320157476678712## Roles1.$trModule
+      (GHC.Types.TrNameS "T1"#) 0 GHC.Types.krep$*Arr*
 Roles1.$tc'K1
   = GHC.Types.TyCon
-      1265606750138351672##
-      7033043930969109074##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K1"#)
-      1
-      $krep
+      1265606750138351672## 7033043930969109074## Roles1.$trModule
+      (GHC.Types.TrNameS "'K1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 1
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
@@ -172,3 +116,4 @@ Roles1.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles1"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr
index a55e57f080..54e01992be 100644
--- a/testsuite/tests/roles/should_compile/Roles14.stderr
+++ b/testsuite/tests/roles/should_compile/Roles14.stderr
@@ -6,26 +6,18 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
   axiom Roles12.N:C2 :: C2 a = a -> a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles12.$tcC2
   = GHC.Types.TyCon
-      7996680154108933333##
-      9454227235464419996##
-      Roles12.$trModule
-      (GHC.Types.TrNameS "C2"#)
-      0
-      $krep
+      7996680154108933333## 9454227235464419996## Roles12.$trModule
+      (GHC.Types.TrNameS "C2"#) 0 $krep
 Roles12.$tc'C:C2
   = GHC.Types.TyCon
-      7087988437584478859##
-      11477953550142401435##
-      Roles12.$trModule
-      (GHC.Types.TrNameS "'C:C2"#)
-      1
-      $krep
+      7087988437584478859## 11477953550142401435## Roles12.$trModule
+      (GHC.Types.TrNameS "'C:C2"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -39,3 +31,4 @@ Roles12.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles12"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr
index c1d6cc3870..7d721f2c12 100644
--- a/testsuite/tests/roles/should_compile/Roles2.stderr
+++ b/testsuite/tests/roles/should_compile/Roles2.stderr
@@ -6,42 +6,26 @@ DATA CONSTRUCTORS
   K2 :: forall a. FunPtr a -> T2 a
   K1 :: forall a. IO a -> T1 a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles2.$tcT2
   = GHC.Types.TyCon
-      9065817229114433861##
-      13399581642971864140##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "T2"#)
-      0
-      GHC.Types.krep$*Arr*
+      9065817229114433861## 13399581642971864140## Roles2.$trModule
+      (GHC.Types.TrNameS "T2"#) 0 GHC.Types.krep$*Arr*
 Roles2.$tc'K2
   = GHC.Types.TyCon
-      17395957229042313563##
-      12263882107019815181##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "'K2"#)
-      1
-      $krep
+      17395957229042313563## 12263882107019815181## Roles2.$trModule
+      (GHC.Types.TrNameS "'K2"#) 1 $krep
 Roles2.$tcT1
   = GHC.Types.TyCon
-      10310640733256438505##
-      9162099558816022096##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "T1"#)
-      0
-      GHC.Types.krep$*Arr*
+      10310640733256438505## 9162099558816022096## Roles2.$trModule
+      (GHC.Types.TrNameS "T1"#) 0 GHC.Types.krep$*Arr*
 Roles2.$tc'K1
   = GHC.Types.TyCon
-      16530009231990968394##
-      11761390951471299534##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "'K1"#)
-      1
-      $krep
+      16530009231990968394## 11761390951471299534## Roles2.$trModule
+      (GHC.Types.TrNameS "'K1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -57,3 +41,4 @@ Roles2.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles2"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr
index 255f2ed773..a7fb7a06c9 100644
--- a/testsuite/tests/roles/should_compile/Roles3.stderr
+++ b/testsuite/tests/roles/should_compile/Roles3.stderr
@@ -21,58 +21,34 @@ COERCION AXIOMS
   axiom Roles3.N:C3 :: C3 a b = a -> F3 b -> F3 b
   axiom Roles3.N:C4 :: C4 a b = a -> F4 b -> F4 b
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles3.$tcC4
   = GHC.Types.TyCon
-      6800596812149592130##
-      15513203864133461281##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C4"#)
-      0
-      $krep
+      6800596812149592130## 15513203864133461281## Roles3.$trModule
+      (GHC.Types.TrNameS "C4"#) 0 $krep
 Roles3.$tcC3
   = GHC.Types.TyCon
-      5076086601454991970##
-      10299714674904836194##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C3"#)
-      0
-      $krep
+      5076086601454991970## 10299714674904836194## Roles3.$trModule
+      (GHC.Types.TrNameS "C3"#) 0 $krep
 Roles3.$tcC2
   = GHC.Types.TyCon
-      7902873224172523979##
-      11840994447152209031##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C2"#)
-      0
-      $krep
+      7902873224172523979## 11840994447152209031## Roles3.$trModule
+      (GHC.Types.TrNameS "C2"#) 0 $krep
 Roles3.$tc'C:C2
   = GHC.Types.TyCon
-      11218882737915989529##
-      9454910899374397367##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "'C:C2"#)
-      2
-      $krep
+      11218882737915989529## 9454910899374397367## Roles3.$trModule
+      (GHC.Types.TrNameS "'C:C2"#) 2 $krep
 Roles3.$tcC1
   = GHC.Types.TyCon
-      11013585501375994163##
-      16371608655219610659##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C1"#)
-      0
-      $krep
+      11013585501375994163## 16371608655219610659## Roles3.$trModule
+      (GHC.Types.TrNameS "C1"#) 0 $krep
 Roles3.$tc'C:C1
   = GHC.Types.TyCon
-      4508088879886988796##
-      13962145553903222779##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "'C:C1"#)
-      1
-      $krep
+      4508088879886988796## 13962145553903222779## Roles3.$trModule
+      (GHC.Types.TrNameS "'C:C1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 1
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -97,3 +73,4 @@ Roles3.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles3"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr
index 8a8851a0a2..8f1d58183b 100644
--- a/testsuite/tests/roles/should_compile/Roles4.stderr
+++ b/testsuite/tests/roles/should_compile/Roles4.stderr
@@ -9,42 +9,26 @@ COERCION AXIOMS
   axiom Roles4.N:C1 :: C1 a = a -> a
   axiom Roles4.N:C3 :: C3 a = a -> Syn1 a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles4.$tcC3
   = GHC.Types.TyCon
-      7508642517340826358##
-      16938219270597865136##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "C3"#)
-      0
-      $krep
+      7508642517340826358## 16938219270597865136## Roles4.$trModule
+      (GHC.Types.TrNameS "C3"#) 0 $krep
 Roles4.$tc'C:C3
   = GHC.Types.TyCon
-      3133378316178104365##
-      15809386433947157376##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "'C:C3"#)
-      1
-      $krep
+      3133378316178104365## 15809386433947157376## Roles4.$trModule
+      (GHC.Types.TrNameS "'C:C3"#) 1 $krep
 Roles4.$tcC1
   = GHC.Types.TyCon
-      13392243382482428602##
-      1780037961948725012##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "C1"#)
-      0
-      $krep
+      13392243382482428602## 1780037961948725012## Roles4.$trModule
+      (GHC.Types.TrNameS "C1"#) 0 $krep
 Roles4.$tc'C:C1
   = GHC.Types.TyCon
-      3870707671502302648##
-      10631907186261837450##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "'C:C1"#)
-      1
-      $krep
+      3870707671502302648## 10631907186261837450## Roles4.$trModule
+      (GHC.Types.TrNameS "'C:C1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -64,3 +48,4 @@ Roles4.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles4"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr
index f498b9b009..07d0496799 100644
--- a/testsuite/tests/roles/should_compile/T8958.stderr
+++ b/testsuite/tests/roles/should_compile/T8958.stderr
@@ -17,7 +17,7 @@ CLASS INSTANCES
   instance [incoherent] Nominal a -- Defined at T8958.hs:7:10
 Dependent modules: []
 Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 T8958.$tcMap