language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Change TraitRef::hir_fmt_ext to free-standing function

Browse source
This commit is contained in:
Florian Diebold 2021-04-07 20:26:27 +02:00
parent eb248d85a0
commit 86feac18e8
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -792,31 +792,29 @@ fn write_bounds_like_dyn_trait(
Ok(()) Ok(())
} }
impl TraitRef { fn fmt_trait_ref(tr: &TraitRef, f: &mut HirFormatter, use_as: bool) -> Result<(), HirDisplayError> {
fn hir_fmt_ext(&self, f: &mut HirFormatter, use_as: bool) -> Result<(), HirDisplayError> {
if f.should_truncate() { if f.should_truncate() {
return write!(f, "{}", TYPE_HINT_TRUNCATION); return write!(f, "{}", TYPE_HINT_TRUNCATION);
} }
self.self_type_parameter(&Interner).hir_fmt(f)?; tr.self_type_parameter(&Interner).hir_fmt(f)?;
if use_as { if use_as {
write!(f, " as ")?; write!(f, " as ")?;
} else { } else {
write!(f, ": ")?; write!(f, ": ")?;
} }
write!(f, "{}", f.db.trait_data(self.hir_trait_id()).name)?; write!(f, "{}", f.db.trait_data(tr.hir_trait_id()).name)?;
if self.substitution.len(&Interner) > 1 { if tr.substitution.len(&Interner) > 1 {
write!(f, "<")?; write!(f, "<")?;
f.write_joined(&self.substitution.interned()[1..], ", ")?; f.write_joined(&tr.substitution.interned()[1..], ", ")?;
write!(f, ">")?; write!(f, ">")?;
} }
Ok(()) Ok(())
} }
}
impl HirDisplay for TraitRef { impl HirDisplay for TraitRef {
fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> { fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
self.hir_fmt_ext(f, false) fmt_trait_ref(self, f, false)
} }
} }
@ -830,7 +828,7 @@ impl HirDisplay for WhereClause {
WhereClause::Implemented(trait_ref) => trait_ref.hir_fmt(f)?, WhereClause::Implemented(trait_ref) => trait_ref.hir_fmt(f)?,
WhereClause::AliasEq(AliasEq { alias: AliasTy::Projection(projection_ty), ty }) => { WhereClause::AliasEq(AliasEq { alias: AliasTy::Projection(projection_ty), ty }) => {
write!(f, "<")?; write!(f, "<")?;
projection_ty.trait_ref(f.db).hir_fmt_ext(f, true)?; fmt_trait_ref(&projection_ty.trait_ref(f.db), f, true)?;
write!( write!(
f, f,
">::{} = ", ">::{} = ",