Fixed some HoTT bugs, provide a proper error message when giving an ill-formed

universe instance.

4 files changed, 5 insertions, 19 deletions

diff --git a/test-suite/bugs/opened/3374.v b/test-suite/bugs/closed/3374.v
index 8a62838f06..3c67703a2b 100644
--- a/test-suite/bugs/opened/3374.v
+++ b/test-suite/bugs/closed/3374.v
@@ -32,7 +32,8 @@ Proof.
   apply (dirprodtosetquot R R).
   apply dirprodpair; [ exact c | exact c0 ].
   Undo.
-  Fail exact (dirprodpair c c0).
+  exact (dirprodpair c c0).
+Defined.
   (* Toplevel input, characters 39-40:
 Error:
 In environment
diff --git a/test-suite/bugs/opened/3375.v b/test-suite/bugs/closed/3375.v
index 9cb43413b3..fe323fcb28 100644
--- a/test-suite/bugs/opened/3375.v
+++ b/test-suite/bugs/closed/3375.v
@@ -7,7 +7,7 @@ Definition UU := Set.
 Definition dirprod ( X Y : UU ) := sigT ( fun x : X => Y ) .
 Definition dirprodpair { X Y : UU } := existT ( fun x : X => Y ) .
 Definition hProp := sigT (fun X : Type => admit).
-Axiom hProppair : forall ( X : UU ) ( is : admit ), hProp@{Set i}.
+Axiom hProppair : forall ( X : UU ) ( is : admit ), hProp.
 Definition hProptoType := @projT1 _ _ : hProp -> Type .
 Coercion hProptoType: hProp >-> Sortclass.
 Definition ishinh_UU ( X : UU ) : UU := forall P: Set, ( ( X -> P ) -> P ).
@@ -31,7 +31,7 @@ Definition iseqclassconstr { X : UU } ( R : hrel X ) { A : hsubtypes X } ( ax0 :
   pose @iseqclassconstr'.
   intros.
   exact (dirprodpair ax0 (dirprodpair ax1 ax2)).
-Fail Defined.
+Defined.
 (* Toplevel input, characters 15-23:
 Error: Illegal application:
 The term "dirprodpair" of type
diff --git a/test-suite/bugs/opened/3372.v b/test-suite/bugs/opened/3372.v
index 41ee400fd9..13ce75b84c 100644
--- a/test-suite/bugs/opened/3372.v
+++ b/test-suite/bugs/opened/3372.v
@@ -1,5 +1,5 @@
 Set Universe Polymorphism.
 Definition hProp : Type := sigT (fun _ : Type => True).
-Fail Goal hProp@{Set}. (* Toplevel input, characters 15-32:
+Goal hProp@{Set}. (* Toplevel input, characters 15-32:
 Anomaly: Uncaught exception Invalid_argument("Array.iter2", _).
 Please report. *)
diff --git a/test-suite/bugs/opened/3373.v b/test-suite/bugs/opened/3373.v
deleted file mode 100644
index 8b3b515678..0000000000
--- a/test-suite/bugs/opened/3373.v
+++ /dev/null
@@ -1,15 +0,0 @@
-(* File reduced by coq-bug-finder from original input, then from 5968 lines to 11933 lines, then from 11239 lines to 11231 lines, then from 10365 lines to 446 lines, then from 456 lines to 379 lines, then from 391 lines to 373 lines, then from 369 lines to 351 lines, then from 350 lines to 340 lines, then from 348 lines to 320 lines, then from 328 lines to 302 lines, then from 332 lines to 21 lines *)
-Set Universe Polymorphism.
-Axiom admit : forall {T}, T.
-Definition UU := Set.
-Definition UU' := Type.
-Definition hSet:= sigT (fun X : UU' => admit) .
-Definition pr1hSet:= @projT1 UU (fun X : UU' => admit) : hSet -> Type.
-Coercion pr1hSet: hSet >-> Sortclass.
-Axiom binop : UU -> Type.
-Axiom setwithbinop : Type.
-Definition pr1setwithbinop : setwithbinop -> hSet.
-Fail exact ( @projT1 _ ( fun X : hSet@{i j} => binop X ) ).
-(* Toplevel input, characters 15-69:
-Anomaly: apply_coercion_args: mismatch between arguments and coercion.
-Please report. *)