Cleanup in Univ, moving code for UniverseConstraints outside the kernel in Universes.

Needed to exponse compare_head_gen(_leq) so that it could be reused in Universes.
Remove unused functions from univ as well and refactor a little bit.
Changed the syntax to Type@{} for explicit universe level specs, following the WG decision.

1 files changed, 4 insertions, 12 deletions

diff --git a/kernel/term.mli b/kernel/term.mli
index 2d3df6e1e..5ff5f9ba1 100644
--- a/kernel/term.mli
+++ b/kernel/term.mli
@@ -421,22 +421,14 @@ val mkCoFix : cofixpoint -> constr
 val eq_constr : constr -> constr -> bool
 (** Alias for [Constr.equal] *)
 
-(** [eq_constr_univs a b] [true, c] if [a] equals [b] modulo alpha, casts,
-   application grouping and the universe equalities in [c]. *)
+(** [eq_constr_univs u a b] is [true] if [a] equals [b] modulo alpha, casts,
+   application grouping and the universe constraints in [u]. *)
 val eq_constr_univs : constr Univ.check_function
 
-(** [leq_constr_univs a b] [true, c] if [a] is convertible to [b] modulo 
-    alpha, casts, application grouping and the universe inequalities in [c]. *)
+(** [leq_constr_univs u a b] is [true] if [a] is convertible to [b] modulo 
+    alpha, casts, application grouping and the universe constraints in [u]. *)
 val leq_constr_univs : constr Univ.check_function
 
-(** [eq_constr_universes a b] [true, c] if [a] equals [b] modulo alpha, casts,
-   application grouping and the universe equalities in [c]. *)
-val eq_constr_universes : constr -> constr -> bool Univ.universe_constrained
-
-(** [leq_constr_universes a b] [true, c] if [a] is convertible to [b] modulo
-    alpha, casts, application grouping and the universe inequalities in [c]. *)
-val leq_constr_universes : constr -> constr -> bool Univ.universe_constrained
-
 (** [eq_constr_univs a b] [true, c] if [a] equals [b] modulo alpha, casts,
    application grouping and ignoring universe instances. *)
 val eq_constr_nounivs : constr -> constr -> bool