diff options
| author | Pierre-Marie Pédrot | 2015-09-25 14:19:25 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2015-09-25 14:19:25 +0200 |
| commit | ccd23fa241ab11477b2fec48ba5262206a1134d5 (patch) | |
| tree | d864a4ad99f869b03c2c08650029e03fa1400c32 /kernel/safe_typing.ml | |
| parent | 8a031dc29abf1e16b2ee78322a7221b8b5c19a33 (diff) | |
| parent | 8e25e107a8715728a7227934d7b11035863ee5f0 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'kernel/safe_typing.ml')
| -rw-r--r-- | kernel/safe_typing.ml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index 907ad2a1d4..55e767321b 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -81,8 +81,7 @@ open Declarations These fields could be deduced from [revstruct], but they allow faster name freshness checks. - [univ] and [future_cst] : current and future universe constraints - - [engagement] : are we Set-impredicative? - - [type_in_type] : does the universe hierarchy collapse? + - [engagement] : are we Set-impredicative? does the universe hierarchy collapse? - [required] : names and digests of Require'd libraries since big-bang. This field will only grow - [loads] : list of libraries Require'd inside the current module. @@ -122,7 +121,6 @@ type safe_environment = univ : Univ.constraints; future_cst : Univ.constraints Future.computation list; engagement : engagement option; - type_in_type : bool; required : vodigest DPMap.t; loads : (module_path * module_body) list; local_retroknowledge : Retroknowledge.action list; @@ -152,7 +150,6 @@ let empty_environment = future_cst = []; univ = Univ.Constraint.empty; engagement = None; - type_in_type = false; required = DPMap.empty; loads = []; local_retroknowledge = []; |