diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-08 16:49:45 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-08 16:49:45 +0000 |
| commit | 669efad231ec95ab4b80ab5b083beed233d17843 (patch) | |
| tree | 367e16d0b2cbcbe55f36c44de56356d3c70b26ec /crates/hir_ty/src/traits | |
| parent | a0c2bbf88f5b9a3e235303a99ceaf15cd1e832f7 (diff) | |
| parent | 0c3b38695ad5c77b80f6e05a96e575ec9bea8223 (diff) | |
Merge #7600
7600: Update crates r=flodiebold a=kjeremy
Pulls in https://github.com/rust-lang/chalk/pull/682
Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/traits')
| -rw-r--r-- | crates/hir_ty/src/traits/chalk/interner.rs | 5 |
1 files changed, 3 insertions, 2 deletions
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 { | |||
| 193 | tls::with_current_program(|prog| Some(prog?.debug_quantified_where_clauses(clauses, fmt))) | 193 | tls::with_current_program(|prog| Some(prog?.debug_quantified_where_clauses(clauses, fmt))) |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | fn intern_ty(&self, ty: chalk_ir::TyData<Self>) -> Arc<chalk_ir::TyData<Self>> { | 196 | fn intern_ty(&self, kind: chalk_ir::TyKind<Self>) -> Arc<chalk_ir::TyData<Self>> { |
| 197 | Arc::new(ty) | 197 | let flags = kind.compute_flags(self); |
| 198 | Arc::new(chalk_ir::TyData { kind, flags }) | ||
| 198 | } | 199 | } |
| 199 | 200 | ||
| 200 | fn ty_data<'a>(&self, ty: &'a Arc<chalk_ir::TyData<Self>>) -> &'a chalk_ir::TyData<Self> { | 201 | fn ty_data<'a>(&self, ty: &'a Arc<chalk_ir::TyData<Self>>) -> &'a chalk_ir::TyData<Self> { |