Merge #2025

2025: Bump deps r=matklad a=lnicola



Co-authored-by: Laurențiu Nicola <[email protected]>

3 files changed, 11 insertions, 5 deletions

diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index cc117f84d..7820a12e9 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
 authors = ["rust-analyzer developers"]
 
 [dependencies]
-arrayvec = "0.4.10"
+arrayvec = "0.5.1"
 log = "0.4.5"
 relative-path = "0.4.0"
 rustc-hash = "1.0"
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index cb28fc6bc..ebaff998e 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -414,7 +414,9 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                     // recursive type
                     return tv.fallback_value();
                 }
-                if let Some(known_ty) = self.var_unification_table.probe_value(inner).known() {
+                if let Some(known_ty) =
+                    self.var_unification_table.inlined_probe_value(inner).known()
+                {
                     // known_ty may contain other variables that are known by now
                     tv_stack.push(inner);
                     let result = self.resolve_ty_as_possible(tv_stack, known_ty.clone());
@@ -442,7 +444,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             match &*ty {
                 Ty::Infer(tv) => {
                     let inner = tv.to_inner();
-                    match self.var_unification_table.probe_value(inner).known() {
+                    match self.var_unification_table.inlined_probe_value(inner).known() {
                         Some(known_ty) => {
                             // The known_ty can't be a type var itself
                             ty = Cow::Owned(known_ty.clone());
@@ -490,7 +492,9 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                     // recursive type
                     return tv.fallback_value();
                 }
-                if let Some(known_ty) = self.var_unification_table.probe_value(inner).known() {
+                if let Some(known_ty) =
+                    self.var_unification_table.inlined_probe_value(inner).known()
+                {
                     // known_ty may contain other variables that are known by now
                     tv_stack.push(inner);
                     let result = self.resolve_ty_completely(tv_stack, known_ty.clone());
diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs
index 014c7981f..ca33cc7f8 100644
--- a/crates/ra_hir/src/ty/infer/unify.rs
+++ b/crates/ra_hir/src/ty/infer/unify.rs
@@ -54,7 +54,9 @@ where
                     // recursive type
                     return tv.fallback_value();
                 }
-                if let Some(known_ty) = self.ctx.var_unification_table.probe_value(inner).known() {
+                if let Some(known_ty) =
+                    self.ctx.var_unification_table.inlined_probe_value(inner).known()
+                {
                     self.var_stack.push(inner);
                     let result = self.do_canonicalize_ty(known_ty.clone());
                     self.var_stack.pop();