From 0c3b38695ad5c77b80f6e05a96e575ec9bea8223 Mon Sep 17 00:00:00 2001
From: kjeremy <kjeremy@gmail.com>
Date: Mon, 8 Feb 2021 11:38:51 -0500
Subject: Update crates
Pulls in https://github.com/rust-lang/chalk/pull/682
---
crates/hir_ty/Cargo.toml | 6 +++---
crates/hir_ty/src/traits/chalk/interner.rs | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'crates/hir_ty')
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index f6bf49546..418ac8cbb 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.55", default-features = false }
-chalk-ir = "0.55"
-chalk-recursive = "0.55"
+chalk-solve = { version = "0.56", default-features = false }
+chalk-ir = "0.56"
+chalk-recursive = "0.56"
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/interner.rs b/crates/hir_ty/src/traits/chalk/interner.rs
index 6a4aa8333..54bd1c724 100644
--- a/crates/hir_ty/src/traits/chalk/interner.rs
+++ b/crates/hir_ty/src/traits/chalk/interner.rs
@@ -193,8 +193,9 @@ impl chalk_ir::interner::Interner for Interner {
tls::with_current_program(|prog| Some(prog?.debug_quantified_where_clauses(clauses, fmt)))
}
- fn intern_ty(&self, ty: chalk_ir::TyData<Self>) -> Arc<chalk_ir::TyData<Self>> {
- Arc::new(ty)
+ fn intern_ty(&self, kind: chalk_ir::TyKind<Self>) -> Arc<chalk_ir::TyData<Self>> {
+ let flags = kind.compute_flags(self);
+ Arc::new(chalk_ir::TyData { kind, flags })
}
fn ty_data<'a>(&self, ty: &'a Arc<chalk_ir::TyData<Self>>) -> &'a chalk_ir::TyData<Self> {
--
cgit v1.2.3