Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 212 insertions, 0 deletions

diff --git a/vendor/chalk-solve-0.87.0/src/infer.rs b/vendor/chalk-solve-0.87.0/src/infer.rs
new file mode 100644
index 000000000..6ede065e0
--- /dev/null
+++ b/vendor/chalk-solve-0.87.0/src/infer.rs
@@ -0,0 +1,212 @@
+use chalk_ir::interner::{HasInterner, Interner};
+use chalk_ir::*;
+use chalk_ir::{cast::Cast, fold::TypeFoldable};
+use tracing::debug;
+
+mod canonicalize;
+pub(crate) mod instantiate;
+mod invert;
+mod test;
+pub mod ucanonicalize;
+pub mod unify;
+mod var;
+
+use self::var::*;
+
+#[derive(Clone)]
+pub struct InferenceTable<I: Interner> {
+    unify: ena::unify::InPlaceUnificationTable<EnaVariable<I>>,
+    vars: Vec<EnaVariable<I>>,
+    max_universe: UniverseIndex,
+}
+
+pub struct InferenceSnapshot<I: Interner> {
+    unify_snapshot: ena::unify::Snapshot<ena::unify::InPlace<EnaVariable<I>>>,
+    max_universe: UniverseIndex,
+    vars: Vec<EnaVariable<I>>,
+}
+
+#[allow(type_alias_bounds)]
+pub type ParameterEnaVariable<I: Interner> = WithKind<I, EnaVariable<I>>;
+
+impl<I: Interner> InferenceTable<I> {
+    /// Create an empty inference table with no variables.
+    pub fn new() -> Self {
+        InferenceTable {
+            unify: ena::unify::UnificationTable::new(),
+            vars: vec![],
+            max_universe: UniverseIndex::root(),
+        }
+    }
+
+    /// Creates a new inference table, pre-populated with
+    /// `num_universes` fresh universes. Instantiates the canonical
+    /// value `canonical` within those universes (which must not
+    /// reference any universe greater than `num_universes`). Returns
+    /// the substitution mapping from each canonical binder to its
+    /// corresponding existential variable, along with the
+    /// instantiated result.
+    pub fn from_canonical<T>(
+        interner: I,
+        num_universes: usize,
+        canonical: Canonical<T>,
+    ) -> (Self, Substitution<I>, T)
+    where
+        T: HasInterner<Interner = I> + TypeFoldable<I> + Clone,
+    {
+        let mut table = InferenceTable::new();
+
+        assert!(num_universes >= 1); // always have U0
+        for _ in 1..num_universes {
+            table.new_universe();
+        }
+
+        let subst = table.fresh_subst(interner, canonical.binders.as_slice(interner));
+        let value = subst.apply(canonical.value, interner);
+        // let value = canonical.value.fold_with(&mut &subst, 0).unwrap();
+
+        (table, subst, value)
+    }
+
+    /// Creates and returns a fresh universe that is distinct from all
+    /// others created within this inference table. This universe is
+    /// able to see all previously created universes (though hopefully
+    /// it is only brought into contact with its logical *parents*).
+    pub fn new_universe(&mut self) -> UniverseIndex {
+        let u = self.max_universe.next();
+        self.max_universe = u;
+        debug!("created new universe: {:?}", u);
+        u
+    }
+
+    /// Creates a new inference variable and returns its index. The
+    /// kind of the variable should be known by the caller, but is not
+    /// tracked directly by the inference table.
+    pub fn new_variable(&mut self, ui: UniverseIndex) -> EnaVariable<I> {
+        let var = self.unify.new_key(InferenceValue::Unbound(ui));
+        self.vars.push(var);
+        debug!(?var, ?ui, "created new variable");
+        var
+    }
+
+    /// Takes a "snapshot" of the current state of the inference
+    /// table.  Later, you must invoke either `rollback_to` or
+    /// `commit` with that snapshot.  Snapshots can be nested, but you
+    /// must respect a stack discipline (i.e., rollback or commit
+    /// snapshots in reverse order of that with which they were
+    /// created).
+    pub fn snapshot(&mut self) -> InferenceSnapshot<I> {
+        let unify_snapshot = self.unify.snapshot();
+        let vars = self.vars.clone();
+        let max_universe = self.max_universe;
+        InferenceSnapshot {
+            unify_snapshot,
+            max_universe,
+            vars,
+        }
+    }
+
+    /// Restore the table to the state it had when the snapshot was taken.
+    pub fn rollback_to(&mut self, snapshot: InferenceSnapshot<I>) {
+        self.unify.rollback_to(snapshot.unify_snapshot);
+        self.vars = snapshot.vars;
+        self.max_universe = snapshot.max_universe;
+    }
+
+    /// Make permanent the changes made since the snapshot was taken.
+    pub fn commit(&mut self, snapshot: InferenceSnapshot<I>) {
+        self.unify.commit(snapshot.unify_snapshot);
+    }
+
+    pub fn normalize_ty_shallow(&mut self, interner: I, leaf: &Ty<I>) -> Option<Ty<I>> {
+        // An integer/float type variable will never normalize to another
+        // variable; but a general type variable might normalize to an
+        // integer/float variable. So we potentially need to normalize twice to
+        // get at the actual value.
+        self.normalize_ty_shallow_inner(interner, leaf)
+            .map(|ty| self.normalize_ty_shallow_inner(interner, &ty).unwrap_or(ty))
+    }
+
+    fn normalize_ty_shallow_inner(&mut self, interner: I, leaf: &Ty<I>) -> Option<Ty<I>> {
+        self.probe_var(leaf.inference_var(interner)?)
+            .map(|p| p.assert_ty_ref(interner).clone())
+    }
+
+    pub fn normalize_lifetime_shallow(
+        &mut self,
+        interner: I,
+        leaf: &Lifetime<I>,
+    ) -> Option<Lifetime<I>> {
+        self.probe_var(leaf.inference_var(interner)?)
+            .map(|p| p.assert_lifetime_ref(interner).clone())
+    }
+
+    pub fn normalize_const_shallow(&mut self, interner: I, leaf: &Const<I>) -> Option<Const<I>> {
+        self.probe_var(leaf.inference_var(interner)?)
+            .map(|p| p.assert_const_ref(interner).clone())
+    }
+
+    pub fn ty_root(&mut self, interner: I, leaf: &Ty<I>) -> Option<Ty<I>> {
+        Some(
+            self.unify
+                .find(leaf.inference_var(interner)?)
+                .to_ty(interner),
+        )
+    }
+
+    pub fn lifetime_root(&mut self, interner: I, leaf: &Lifetime<I>) -> Option<Lifetime<I>> {
+        Some(
+            self.unify
+                .find(leaf.inference_var(interner)?)
+                .to_lifetime(interner),
+        )
+    }
+
+    /// Finds the root inference var for the given variable.
+    ///
+    /// The returned variable will be exactly equivalent to the given
+    /// variable except in name. All variables which have been unified to
+    /// eachother (but don't yet have a value) have the same "root".
+    ///
+    /// This is useful for `DeepNormalizer`.
+    pub fn inference_var_root(&mut self, var: InferenceVar) -> InferenceVar {
+        self.unify.find(var).into()
+    }
+
+    /// If type `leaf` is a free inference variable, and that variable has been
+    /// bound, returns `Some(P)` where `P` is the parameter to which it has been bound.
+    pub fn probe_var(&mut self, leaf: InferenceVar) -> Option<GenericArg<I>> {
+        match self.unify.probe_value(EnaVariable::from(leaf)) {
+            InferenceValue::Unbound(_) => None,
+            InferenceValue::Bound(val) => Some(val),
+        }
+    }
+
+    /// Given an unbound variable, returns its universe.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the variable is bound.
+    fn universe_of_unbound_var(&mut self, var: EnaVariable<I>) -> UniverseIndex {
+        match self.unify.probe_value(var) {
+            InferenceValue::Unbound(ui) => ui,
+            InferenceValue::Bound(_) => panic!("var_universe invoked on bound variable"),
+        }
+    }
+}
+
+pub trait ParameterEnaVariableExt<I: Interner> {
+    fn to_generic_arg(&self, interner: I) -> GenericArg<I>;
+}
+
+impl<I: Interner> ParameterEnaVariableExt<I> for ParameterEnaVariable<I> {
+    fn to_generic_arg(&self, interner: I) -> GenericArg<I> {
+        // we are matching on kind, so skipping it is fine
+        let ena_variable = self.skip_kind();
+        match &self.kind {
+            VariableKind::Ty(kind) => ena_variable.to_ty_with_kind(interner, *kind).cast(interner),
+            VariableKind::Lifetime => ena_variable.to_lifetime(interner).cast(interner),
+            VariableKind::Const(ty) => ena_variable.to_const(interner, ty.clone()).cast(interner),
+        }
+    }
+}