language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

More renaming

Browse source
This commit is contained in:
Florian Diebold 2021-03-14 16:33:27 +01:00
parent eea777c714
commit 1954147834
5 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/hir_ty/src/lib.rs
View file

@ -66,7 +66,7 @@ pub enum Lifetime {
#[derive(Clone, PartialEq, Eq, Debug, Hash)]
pub struct OpaqueTy {
pub opaque_ty_id: OpaqueTyId,
pub parameters: Substs,
pub substitution: Substs,
}
/// A "projection" type corresponds to an (unnormalized)
@ -903,7 +903,7 @@ impl Ty {
let data = (*it)
.as_ref()
.map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
data.subst(&opaque_ty.parameters)
data.subst(&opaque_ty.substitution)
})
}
// It always has an parameter for Future::Output type.
@ -1059,7 +1059,7 @@ impl TypeWalk for Ty {
}
}
TyKind::Alias(AliasTy::Opaque(o_ty)) => {
for t in o_ty.parameters.iter() {
for t in o_ty.substitution.iter() {
t.walk(f);
}
}
@ -1094,7 +1094,7 @@ impl TypeWalk for Ty {
}
}
TyKind::Alias(AliasTy::Opaque(o_ty)) => {
o_ty.parameters.walk_mut_binders(f, binders);
o_ty.substitution.walk_mut_binders(f, binders);
}
_ => {
if let Some(substs) = self.substs_mut() {