From 0a1aab9ff96f2479601774e0099fdcd65b6f97b7 Mon Sep 17 00:00:00 2001
From: Jakob von Raumer <javra@web.de>
Date: Wed, 17 Dec 2014 11:58:47 -0500
Subject: [PATCH] chore(hott) make univalence an axiom again

---
 hott/init/axioms/funext_from_ua.hlean | 21 +++++++++---------
 hott/init/axioms/ua.hlean             | 31 +++++++++------------------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/hott/init/axioms/funext_from_ua.hlean b/hott/init/axioms/funext_from_ua.hlean
index b48c2ae15f..8e73facda8 100644
--- a/hott/init/axioms/funext_from_ua.hlean
+++ b/hott/init/axioms/funext_from_ua.hlean
@@ -6,22 +6,21 @@ prelude
 import ..equiv ..datatypes ..types.prod
 import .funext_varieties .ua .funext
 
-open eq function prod sigma truncation equiv is_equiv unit ua_type
+open eq function prod sigma truncation equiv is_equiv unit
 
 context
   universe variables l
-  parameter [UA : ua_type.{l+1}]
 
   protected theorem ua_isequiv_postcompose {A B : Type.{l+1}} {C : Type}
       {w : A → B} {H0 : is_equiv w} : is_equiv (@compose C A B w) :=
     let w' := equiv.mk w H0 in
-    let eqinv : A = B := ((@is_equiv.inv _ _ _ (@ua_type.inst UA A B)) w') in
+    let eqinv : A = B := ((@is_equiv.inv _ _ _ (ua_is_equiv A B)) w') in
     let eq' := equiv_path eqinv in
     is_equiv.adjointify (@compose C A B w)
       (@compose C B A (is_equiv.inv w))
       (λ (x : C → B),
         have eqretr : eq' = w',
-          from (@retr _ _ (@equiv_path A B) (@ua_type.inst UA A B) w'),
+          from (@retr _ _ (@equiv_path A B) (ua_is_equiv A B) w'),
         have invs_eq : (to_fun eq')⁻¹ = (to_fun w')⁻¹,
           from inv_eq eq' w' eqretr,
         have eqfin : (to_fun eq') ∘ ((to_fun eq')⁻¹ ∘ x) = x,
@@ -39,7 +38,7 @@ context
       )
       (λ (x : C → A),
         have eqretr : eq' = w',
-          from (@retr _ _ (@equiv_path A B) ua_type.inst w'),
+          from (@retr _ _ (@equiv_path A B) (ua_is_equiv A B) w'),
         have invs_eq : (to_fun eq')⁻¹ = (to_fun w')⁻¹,
           from inv_eq eq' w' eqretr,
         have eqfin : (to_fun eq')⁻¹ ∘ ((to_fun eq') ∘ x) = x,
@@ -105,19 +104,19 @@ end
 -- Now we use this to prove weak funext, which as we know
 -- implies (with dependent eta) also the strong dependent funext.
 universe variables l k
-theorem weak_funext_from_ua [ua3 : ua_type.{k+1}] [ua4 : ua_type.{k+2}] : weak_funext.{l+1 k+1} :=
+theorem weak_funext_from_ua : weak_funext.{l+1 k+1} :=
   (λ (A : Type) (P : A → Type) allcontr,
     let U := (λ (x : A), unit) in
   have pequiv : Π (x : A), P x ≃ U x,
     from (λ x, @equiv_contr_unit(P x) (allcontr x)),
   have psim : Π (x : A), P x = U x,
     from (λ x, @is_equiv.inv _ _
-      equiv_path ua_type.inst (pequiv x)),
+      equiv_path (ua_is_equiv _ _) (pequiv x)),
   have p : P = U,
-    from @nondep_funext_from_ua _ A Type P U psim,
+    from @nondep_funext_from_ua A Type P U psim,
   have tU' : is_contr (A → unit),
     from is_contr.mk (λ x, ⋆)
-      (λ f, @nondep_funext_from_ua _ A unit (λ x, ⋆) f
+      (λ f, @nondep_funext_from_ua A unit (λ x, ⋆) f
         (λ x, unit.rec_on (f x) idp)),
   have tU : is_contr (Π x, U x),
     from tU',
@@ -127,5 +126,5 @@ theorem weak_funext_from_ua [ua3 : ua_type.{k+1}] [ua4 : ua_type.{k+2}] : weak_f
 )
 
 -- In the following we will proof function extensionality using the univalence axiom
-definition funext_from_ua [instance] [ua ua2 : ua_type] : funext :=
-  funext_from_weak_funext (@weak_funext_from_ua ua ua2)
+definition funext_from_ua [instance] : funext :=
+  funext_from_weak_funext (@weak_funext_from_ua)
diff --git a/hott/init/axioms/ua.hlean b/hott/init/axioms/ua.hlean
index bdcda8d638..ed8bc55286 100644
--- a/hott/init/axioms/ua.hlean
+++ b/hott/init/axioms/ua.hlean
@@ -19,34 +19,23 @@ section
 
 end
 
-inductive ua_type [class] : Type :=
-  mk : (Π (A B : Type), is_equiv (@equiv_path A B)) → ua_type
+axiom ua_is_equiv (A B : Type) : is_equiv (@equiv_path A B)
 
-namespace ua_type
+-- Make the Equivalence given by the axiom an instance
+protected definition inst [instance] (A B : Type) : is_equiv (@equiv_path A B) :=
+ua_is_equiv A B
 
-  context
-    universe k
-    parameters [F : ua_type.{k}] {A B: Type.{k}}
-
-    -- Make the Equivalence given by the axiom an instance
-    protected definition inst [instance] : is_equiv (@equiv_path.{k} A B) :=
-      rec_on F (λ H, H A B)
-
-    -- This is the version of univalence axiom we will probably use most often
-    definition ua : A ≃ B →  A = B :=
-      @is_equiv.inv _ _ (@equiv_path A B) inst
-
-  end
-
-end ua_type
+-- This is the version of univalence axiom we will probably use most often
+definition ua {A B : Type} : A ≃ B →  A = B :=
+@is_equiv.inv _ _ (@equiv_path A B) (inst A B)
 
 -- One consequence of UA is that we can transport along equivalencies of types
 namespace Equiv
   universe variable l
 
-  protected definition subst [UA : ua_type] (P : Type → Type) {A B : Type.{l}} (H : A ≃ B)
-      : P A → P B :=
-    eq.transport P (ua_type.ua H)
+  protected definition subst (P : Type → Type) {A B : Type.{l}} (H : A ≃ B)
+    : P A → P B :=
+  eq.transport P (ua H)
 
   -- We can use this for calculation evironments
   calc_subst subst