From 0c3b38695ad5c77b80f6e05a96e575ec9bea8223 Mon Sep 17 00:00:00 2001 From: kjeremy 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 +++-- crates/syntax/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'crates') 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) -> Arc> { - Arc::new(ty) + fn intern_ty(&self, kind: chalk_ir::TyKind) -> Arc> { + let flags = kind.compute_flags(self); + Arc::new(chalk_ir::TyData { kind, flags }) } fn ty_data<'a>(&self, ty: &'a Arc>) -> &'a chalk_ir::TyData { diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index aa6f6e0b6..e3ef71650 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [dependencies] itertools = "0.10.0" rowan = "0.12.2" -rustc_lexer = { version = "702.0.0", package = "rustc-ap-rustc_lexer" } +rustc_lexer = { version = "705.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" arrayvec = "0.5.1" once_cell = "1.3.1" -- cgit v1.2.3