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 | |
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')
-rw-r--r-- | crates/hir/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 10b8171be..eb1cd66fb 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
@@ -1686,8 +1686,8 @@ impl Type { | |||
1686 | .build(); | 1686 | .build(); |
1687 | let predicate = ProjectionPredicate { | 1687 | let predicate = ProjectionPredicate { |
1688 | projection_ty: ProjectionTy { | 1688 | projection_ty: ProjectionTy { |
1689 | associated_ty: to_assoc_type_id(alias.id), | 1689 | associated_ty_id: to_assoc_type_id(alias.id), |
1690 | parameters: subst, | 1690 | substitution: subst, |
1691 | }, | 1691 | }, |
1692 | ty: TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(&Interner), | 1692 | ty: TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(&Interner), |
1693 | }; | 1693 | }; |
@@ -1979,7 +1979,7 @@ impl Type { | |||
1979 | walk_bounds(db, &type_.derived(ty.clone()), &bounds, cb); | 1979 | walk_bounds(db, &type_.derived(ty.clone()), &bounds, cb); |
1980 | } | 1980 | } |
1981 | 1981 | ||
1982 | walk_substs(db, type_, &opaque_ty.parameters, cb); | 1982 | walk_substs(db, type_, &opaque_ty.substitution, cb); |
1983 | } | 1983 | } |
1984 | TyKind::Placeholder(_) => { | 1984 | TyKind::Placeholder(_) => { |
1985 | if let Some(bounds) = ty.impl_trait_bounds(db) { | 1985 | if let Some(bounds) = ty.impl_trait_bounds(db) { |