From 7bb6fdcf52ea1c468c7f3f0e602be7dabd07cd36 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Tue, 24 Sep 2019 18:27:31 +0200 Subject: Upgrade Chalk again --- Cargo.lock | 10 +++++----- crates/ra_hir/src/ty/traits/chalk.rs | 9 ++++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b6604dcc2..74570a978 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,7 +122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "chalk-engine" version = "0.9.0" -source = "git+https://github.com/rust-lang/chalk.git#aa0c0582e4de1c0b84f99c412d92b9ca7ff06ddb" +source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc" dependencies = [ "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)", "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -132,7 +132,7 @@ dependencies = [ [[package]] name = "chalk-ir" version = "0.1.0" -source = "git+https://github.com/rust-lang/chalk.git#aa0c0582e4de1c0b84f99c412d92b9ca7ff06ddb" +source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc" dependencies = [ "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)", "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)", @@ -142,7 +142,7 @@ dependencies = [ [[package]] name = "chalk-macros" version = "0.1.1" -source = "git+https://github.com/rust-lang/chalk.git#aa0c0582e4de1c0b84f99c412d92b9ca7ff06ddb" +source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "chalk-rust-ir" version = "0.1.0" -source = "git+https://github.com/rust-lang/chalk.git#aa0c0582e4de1c0b84f99c412d92b9ca7ff06ddb" +source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc" dependencies = [ "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)", "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)", @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "chalk-solve" version = "0.1.0" -source = "git+https://github.com/rust-lang/chalk.git#aa0c0582e4de1c0b84f99c412d92b9ca7ff06ddb" +source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc" dependencies = [ "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)", "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)", diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs index 2e17c00e4..462156021 100644 --- a/crates/ra_hir/src/ty/traits/chalk.rs +++ b/crates/ra_hir/src/ty/traits/chalk.rs @@ -385,7 +385,11 @@ where fn impl_datum(&self, impl_id: ImplId) -> Arc { self.db.impl_datum(self.krate, impl_id) } - fn impls_for_trait(&self, trait_id: chalk_ir::TraitId) -> Vec { + fn impls_for_trait( + &self, + trait_id: chalk_ir::TraitId, + _parameters: &[Parameter], + ) -> Vec { debug!("impls_for_trait {:?}", trait_id); if trait_id == UNKNOWN_TRAIT { return Vec::new(); @@ -415,8 +419,7 @@ where &self, projection: &'p chalk_ir::ProjectionTy, ) -> (Arc, &'p [Parameter], &'p [Parameter]) { - let proj_ty: ProjectionTy = from_chalk(self.db, projection.clone()); - debug!("split_projection {:?} = {}", projection, proj_ty.display(self.db)); + debug!("split_projection {:?}", projection); // we don't support GATs, so I think this should always be correct currently (self.db.associated_ty_data(projection.associated_ty_id), &projection.parameters, &[]) } -- cgit v1.2.3