From 4e84e83911c1cf7613a35b921b1e68e097f84b5a Mon Sep 17 00:00:00 2001
From: Gaetan Gilbert
Date: Fri, 21 Apr 2017 20:11:47 +0200
Subject: Remove unused [open] statements

---
 library/goptions.ml  | 1 -
 library/libobject.ml | 1 -
 2 files changed, 2 deletions(-)

(limited to 'library')

diff --git a/library/goptions.ml b/library/goptions.ml
index 1c08b9539f..c111113ca0 100644
--- a/library/goptions.ml
+++ b/library/goptions.ml
@@ -235,7 +235,6 @@ with Not_found ->
   then error "Sorry, this option name is already used."
 
 open Libobject
-open Lib
 
 let warn_deprecated_option =
   CWarnings.create ~name:"deprecated-option" ~category:"deprecated"
diff --git a/library/libobject.ml b/library/libobject.ml
index 8757ca08c6..897591762c 100644
--- a/library/libobject.ml
+++ b/library/libobject.ml
@@ -8,7 +8,6 @@
 
 open Libnames
 open Pp
-open Util
 
 module Dyn = Dyn.Make(struct end)
 
-- 
cgit v1.2.3


From e9b745af47ba3386724b874e3fd74b6dad33b015 Mon Sep 17 00:00:00 2001
From: Gaetan Gilbert
Date: Thu, 6 Apr 2017 22:48:32 +0200
Subject: Allow flexible anonymous universes in instances and sorts.

The addition to the test suite showcases the usage.
---
 library/declare.ml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'library')

diff --git a/library/declare.ml b/library/declare.ml
index 31c9c24bc3..91e0cb44b3 100644
--- a/library/declare.ml
+++ b/library/declare.ml
@@ -514,11 +514,10 @@ let do_constraint poly l =
     match x with
     | GProp -> Loc.dummy_loc, (false, Univ.Level.prop)
     | GSet -> Loc.dummy_loc, (false, Univ.Level.set)
-    | GType None ->
+    | GType None | GType (Some (_, Anonymous)) ->
        user_err ~hdr:"Constraint"
                      (str "Cannot declare constraints on anonymous universes")
-    | GType (Some (loc, id)) ->
-       let id = Id.of_string id in
+    | GType (Some (loc, Name id)) ->
        let names, _ = Global.global_universe_names () in
        try loc, Idmap.find id names
        with Not_found ->
-- 
cgit v1.2.3