diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-14 15:34:37 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-14 15:34:37 +0000 |
commit | 406e4be04c2e74d58bcaa7e823e2509d1a7803d4 (patch) | |
tree | 79dcaa50fe38214d03c4e60b3738ca578e09d659 /crates/hir_ty/src/traits/chalk.rs | |
parent | f57e2f55984758a83644b852a4cc47e0b27945df (diff) | |
parent | 195414783402d6973f4e673e84be9b7bc19cbfa6 (diff) |
Merge #8016
8016: More Chalk adaptations r=flodiebold a=flodiebold
- rename a bunch of fields
- use `chalk_ir::FnSig`
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/traits/chalk.rs')
-rw-r--r-- | crates/hir_ty/src/traits/chalk.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index ef1e6b2df..232cf9cd0 100644 --- a/crates/hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs | |||
@@ -234,9 +234,9 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> { | |||
234 | ty: TyKind::BoundVar(BoundVar { debruijn: DebruijnIndex::ONE, index: 0 }) | 234 | ty: TyKind::BoundVar(BoundVar { debruijn: DebruijnIndex::ONE, index: 0 }) |
235 | .intern(&Interner), | 235 | .intern(&Interner), |
236 | projection_ty: ProjectionTy { | 236 | projection_ty: ProjectionTy { |
237 | associated_ty: to_assoc_type_id(future_output), | 237 | associated_ty_id: to_assoc_type_id(future_output), |
238 | // Self type as the first parameter. | 238 | // Self type as the first parameter. |
239 | parameters: Substs::single( | 239 | substitution: Substs::single( |
240 | TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)) | 240 | TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)) |
241 | .intern(&Interner), | 241 | .intern(&Interner), |
242 | ), | 242 | ), |