Correct rebase on STM code. Thanks to E. Tassi for help on dealing with

latent universes. Now the universes in the type of a definition/lemma
are eagerly added to the environment so that later proofs can be checked
independently of the original (delegated) proof body.

- Fixed firstorder, ring to work correctly with universe polymorphism.
- Changed constr_of_global to raise an anomaly if side effects would be lost by
turning a polymorphic constant into a constr.
- Fix a non-termination issue in solve_evar_evar.
-

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml
index 7d49e452c..35577239b 100644
--- a/kernel/safe_typing.ml
+++ b/kernel/safe_typing.ml
@@ -193,7 +193,8 @@ type constraints_addition =
 
 let add_constraints cst senv =
   match cst with
-  | Later fc -> {senv with future_cst = fc :: senv.future_cst}
+  | Later fc -> 
+    {senv with future_cst = fc :: senv.future_cst}
   | Now cst ->
   { senv with
     env = Environ.add_constraints cst senv.env;