Skip to content

Commit e8d0d79

Browse files
committed
Update Chalk
1 parent aa887d7 commit e8d0d79

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/ra_hir_ty/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ test_utils = { path = "../test_utils" }
2727

2828
scoped-tls = "1"
2929

30-
chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "6222e416b96892b2a86bc08de7dbc9826ff1acea" }
31-
chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "6222e416b96892b2a86bc08de7dbc9826ff1acea" }
32-
chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "6222e416b96892b2a86bc08de7dbc9826ff1acea" }
30+
chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "28cef6ff403d403e6ad2f3d27d944e9ffac1bce8" }
31+
chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "28cef6ff403d403e6ad2f3d27d944e9ffac1bce8" }
32+
chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "28cef6ff403d403e6ad2f3d27d944e9ffac1bce8" }
3333

3434
[dev-dependencies]
3535
insta = "0.16.0"

crates/ra_hir_ty/src/traits/chalk.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,9 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
795795
fn well_known_trait_id(
796796
&self,
797797
_well_known_trait: chalk_rust_ir::WellKnownTrait,
798-
) -> chalk_ir::TraitId<Interner> {
799-
unimplemented!()
798+
) -> Option<chalk_ir::TraitId<Interner>> {
799+
// FIXME tell Chalk about well-known traits (here and in trait_datum)
800+
None
800801
}
801802
}
802803

0 commit comments

Comments
 (0)