diff options
| author | Pierre-Marie Pédrot | 2019-10-21 14:29:33 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2019-10-21 14:29:33 +0200 |
| commit | c6056bdc54d02dc5c6a91aeacb13460e8dd365e3 (patch) | |
| tree | 35ccb682a155ae66ca8af0566027f3e1b886edf4 /kernel | |
| parent | 928096cbc5c46af86f803eb2f70608e9b1a06e9e (diff) | |
| parent | 6aa1131cdb4dcc95b03996d6ed8925297b6bd51f (diff) | |
Merge PR #10863: Minor side effect universe cleanups
Ack-by: JasonGross
Reviewed-by: ppedrot
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/safe_typing.ml | 4 | ||||
| -rw-r--r-- | kernel/safe_typing.mli | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index fc55720583..98465c070b 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -320,10 +320,10 @@ let concat_private = SideEffects.concat let universes_of_private eff = let fold acc eff = match eff.seff_body.const_universes with - | Monomorphic ctx -> ctx :: acc + | Monomorphic ctx -> Univ.ContextSet.union ctx acc | Polymorphic _ -> acc in - List.fold_left fold [] (side_effects_of_private_constants eff) + List.fold_left fold Univ.ContextSet.empty (side_effects_of_private_constants eff) let env_of_safe_env senv = senv.env let env_of_senv = env_of_safe_env diff --git a/kernel/safe_typing.mli b/kernel/safe_typing.mli index 1b55293f1c..1ce790ebbb 100644 --- a/kernel/safe_typing.mli +++ b/kernel/safe_typing.mli @@ -59,7 +59,7 @@ val inline_private_constants : val push_private_constants : Environ.env -> private_constants -> Environ.env (** Push the constants in the environment if not already there. *) -val universes_of_private : private_constants -> Univ.ContextSet.t list +val universes_of_private : private_constants -> Univ.ContextSet.t val is_curmod_library : safe_environment -> bool |