diff options
Diffstat (limited to 'crates/hir_ty/src/lib.rs')
-rw-r--r-- | crates/hir_ty/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs index bc7a7369a..484652073 100644 --- a/crates/hir_ty/src/lib.rs +++ b/crates/hir_ty/src/lib.rs | |||
@@ -66,7 +66,7 @@ pub enum Lifetime { | |||
66 | #[derive(Clone, PartialEq, Eq, Debug, Hash)] | 66 | #[derive(Clone, PartialEq, Eq, Debug, Hash)] |
67 | pub struct OpaqueTy { | 67 | pub struct OpaqueTy { |
68 | pub opaque_ty_id: OpaqueTyId, | 68 | pub opaque_ty_id: OpaqueTyId, |
69 | pub parameters: Substs, | 69 | pub substitution: Substs, |
70 | } | 70 | } |
71 | 71 | ||
72 | /// A "projection" type corresponds to an (unnormalized) | 72 | /// A "projection" type corresponds to an (unnormalized) |
@@ -903,7 +903,7 @@ impl Ty { | |||
903 | let data = (*it) | 903 | let data = (*it) |
904 | .as_ref() | 904 | .as_ref() |
905 | .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone()); | 905 | .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone()); |
906 | data.subst(&opaque_ty.parameters) | 906 | data.subst(&opaque_ty.substitution) |
907 | }) | 907 | }) |
908 | } | 908 | } |
909 | // It always has an parameter for Future::Output type. | 909 | // It always has an parameter for Future::Output type. |
@@ -1059,7 +1059,7 @@ impl TypeWalk for Ty { | |||
1059 | } | 1059 | } |
1060 | } | 1060 | } |
1061 | TyKind::Alias(AliasTy::Opaque(o_ty)) => { | 1061 | TyKind::Alias(AliasTy::Opaque(o_ty)) => { |
1062 | for t in o_ty.parameters.iter() { | 1062 | for t in o_ty.substitution.iter() { |
1063 | t.walk(f); | 1063 | t.walk(f); |
1064 | } | 1064 | } |
1065 | } | 1065 | } |
@@ -1094,7 +1094,7 @@ impl TypeWalk for Ty { | |||
1094 | } | 1094 | } |
1095 | } | 1095 | } |
1096 | TyKind::Alias(AliasTy::Opaque(o_ty)) => { | 1096 | TyKind::Alias(AliasTy::Opaque(o_ty)) => { |
1097 | o_ty.parameters.walk_mut_binders(f, binders); | 1097 | o_ty.substitution.walk_mut_binders(f, binders); |
1098 | } | 1098 | } |
1099 | _ => { | 1099 | _ => { |
1100 | if let Some(substs) = self.substs_mut() { | 1100 | if let Some(substs) = self.substs_mut() { |