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

Move things in hir_ty into submodules

Browse source 
- all the types that will be replaced by Chalk go to `types`
 - `TypeWalk` impls go to `walk`
This commit is contained in:
Florian Diebold 2021-04-04 20:22:00 +02:00
parent bc8b278841
commit 508a1ecad3
11 changed files with 751 additions and 707 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/hir_ty/src/display.rs
View file

@ -260,7 +260,7 @@ impl HirDisplay for ProjectionTy {
write!(f, "<{} as {}", first_parameter, trait_.name)?;
if self.substitution.len(&Interner) > 1 {
write!(f, "<")?;
f.write_joined(&self.substitution.interned(&Interner)[1..], ", ")?;
f.write_joined(&self.substitution.interned()[1..], ", ")?;
write!(f, ">")?;
}
write!(f, ">::{}", f.db.type_alias_data(from_assoc_type_id(self.associated_ty_id)).name)?;
@ -387,7 +387,7 @@ impl HirDisplay for Ty {
write!(f, ",)")?;
} else {
write!(f, "(")?;
f.write_joined(&*substs.0, ", ")?;
f.write_joined(&*substs.interned(), ", ")?;
write!(f, ")")?;
}
}
@ -415,7 +415,7 @@ impl HirDisplay for Ty {
// We print all params except implicit impl Trait params. Still a bit weird; should we leave out parent and self?
if total_len > 0 {
write!(f, "<")?;
f.write_joined(&parameters.0[..total_len], ", ")?;
f.write_joined(&parameters.interned()[..total_len], ", ")?;
write!(f, ">")?;
}
}
@ -468,7 +468,7 @@ impl HirDisplay for Ty {
.map(|generic_def_id| f.db.generic_defaults(generic_def_id))
.filter(|defaults| !defaults.is_empty())
{
None => parameters.0.as_ref(),
None => parameters.interned().as_ref(),
Some(default_parameters) => {
let mut default_from = 0;
for (i, parameter) in parameters.iter(&Interner).enumerate() {
@ -490,11 +490,11 @@ impl HirDisplay for Ty {
}
}
}
&parameters.0[0..default_from]
&parameters.interned()[0..default_from]
}
}
} else {
parameters.0.as_ref()
parameters.interned().as_ref()
};
if !parameters_to_write.is_empty() {
write!(f, "<")?;
@ -517,7 +517,7 @@ impl HirDisplay for Ty {
write!(f, "{}::{}", trait_.name, type_alias_data.name)?;
if parameters.len(&Interner) > 0 {
write!(f, "<")?;
f.write_joined(&*parameters.0, ", ")?;
f.write_joined(&*parameters.interned(), ", ")?;
write!(f, ">")?;
}
} else {
@ -727,13 +727,13 @@ fn write_bounds_like_dyn_trait(
// existential) here, which is the only thing that's
// possible in actual Rust, and hence don't print it
write!(f, "{}", f.db.trait_data(trait_).name)?;
if let [_, params @ ..] = &*trait_ref.substitution.0 {
if let [_, params @ ..] = &*trait_ref.substitution.interned() {
if is_fn_trait {
if let Some(args) =
params.first().and_then(|it| it.assert_ty_ref(&Interner).as_tuple())
{
write!(f, "(")?;
f.write_joined(&*args.0, ", ")?;
f.write_joined(&*args.interned(), ", ")?;
write!(f, ")")?;
}
} else if !params.is_empty() {
@ -789,7 +789,7 @@ impl TraitRef {
write!(f, "{}", f.db.trait_data(self.hir_trait_id()).name)?;
if self.substitution.len(&Interner) > 1 {
write!(f, "<")?;
f.write_joined(&self.substitution.interned(&Interner)[1..], ", ")?;
f.write_joined(&self.substitution.interned()[1..], ", ")?;
write!(f, ">")?;
}
Ok(())