Merge #7523

7523: Bump chalk and rustc_lexer r=lnicola a=lnicola

bors r+

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

2 files changed, 5 insertions, 5 deletions

diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index c7502bf57..f6bf49546 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -17,9 +17,9 @@ ena = "0.14.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 scoped-tls = "1"
-chalk-solve = { version = "0.51", default-features = false }
-chalk-ir = "0.51"
-chalk-recursive = "0.51"
+chalk-solve = { version = "0.55", default-features = false }
+chalk-ir = "0.55"
+chalk-recursive = "0.55"
 la-arena = { version = "0.2.0", path = "../../lib/arena" }
 
 stdx = { path = "../stdx", version = "0.0.0" }
diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs
index cfb756158..d74c83737 100644
--- a/crates/hir_ty/src/traits/chalk.rs
+++ b/crates/hir_ty/src/traits/chalk.rs
@@ -675,7 +675,7 @@ pub(crate) fn fn_def_variance_query(
 ) -> Variances {
     let callable_def: CallableDefId = from_chalk(db, fn_def_id);
     let generic_params = generics(db.upcast(), callable_def.into());
-    Variances::from(
+    Variances::from_iter(
         &Interner,
         std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()),
     )
@@ -688,7 +688,7 @@ pub(crate) fn adt_variance_query(
 ) -> Variances {
     let adt: crate::AdtId = from_chalk(db, adt_id);
     let generic_params = generics(db.upcast(), adt.into());
-    Variances::from(
+    Variances::from_iter(
         &Interner,
         std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()),
     )