bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir/src/display.rs')
-rw-r--r--crates/hir/src/display.rs56
1 files changed, 27 insertions, 29 deletions
diff --git a/crates/hir/src/display.rs b/crates/hir/src/display.rs
index 88d4b6f6bc..8885f328db 100644
--- a/crates/hir/src/display.rs
+++ b/crates/hir/src/display.rs
@@ -88,7 +88,7 @@ impl HirDisplay for Function {
if let Some(abi) = &data.abi {
write!(f, "extern \"{}\" ", abi.as_str())?;
}
- write!(f, "fn {}", data.name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "fn {}", data.name.display(f.db, f.edition()))?;
write_generic_params(GenericDefId::FunctionId(self.id), f)?;
@@ -112,8 +112,7 @@ impl HirDisplay for Function {
}
let pat_id = body.params[param.idx - body.self_param.is_some() as usize];
- let pat_str =
- body.pretty_print_pat(db.upcast(), self.id.into(), pat_id, true, f.edition());
+ let pat_str = body.pretty_print_pat(db, self.id.into(), pat_id, true, f.edition());
f.write_str(&pat_str)?;
f.write_str(": ")?;
@@ -194,7 +193,7 @@ fn write_impl_header(impl_: &Impl, f: &mut HirFormatter<'_>) -> Result<(), HirDi
if let Some(trait_) = impl_.trait_(db) {
let trait_data = db.trait_signature(trait_.id);
- write!(f, " {} for", trait_data.name.display(db.upcast(), f.edition()))?;
+ write!(f, " {} for", trait_data.name.display(db, f.edition()))?;
}
f.write_char(' ')?;
@@ -245,7 +244,7 @@ impl HirDisplay for Struct {
// FIXME: Render repr if its set explicitly?
write_visibility(module_id, self.visibility(f.db), f)?;
f.write_str("struct ")?;
- write!(f, "{}", self.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", self.name(f.db).display(f.db, f.edition()))?;
let def_id = GenericDefId::AdtId(AdtId::StructId(self.id));
write_generic_params(def_id, f)?;
@@ -284,7 +283,7 @@ impl HirDisplay for Enum {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
write_visibility(self.module(f.db).id, self.visibility(f.db), f)?;
f.write_str("enum ")?;
- write!(f, "{}", self.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", self.name(f.db).display(f.db, f.edition()))?;
let def_id = GenericDefId::AdtId(AdtId::EnumId(self.id));
write_generic_params(def_id, f)?;
@@ -301,7 +300,7 @@ impl HirDisplay for Union {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
write_visibility(self.module(f.db).id, self.visibility(f.db), f)?;
f.write_str("union ")?;
- write!(f, "{}", self.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", self.name(f.db).display(f.db, f.edition()))?;
let def_id = GenericDefId::AdtId(AdtId::UnionId(self.id));
write_generic_params(def_id, f)?;
@@ -361,7 +360,7 @@ fn write_variants(
} else {
f.write_str("{\n")?;
for variant in &variants[..count] {
- write!(f, " {}", variant.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, " {}", variant.name(f.db).display(f.db, f.edition()))?;
match variant.kind(f.db) {
StructKind::Tuple => {
let fields_str =
@@ -390,21 +389,21 @@ fn write_variants(
impl HirDisplay for Field {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
write_visibility(self.parent.module(f.db).id, self.visibility(f.db), f)?;
- write!(f, "{}: ", self.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}: ", self.name(f.db).display(f.db, f.edition()))?;
self.ty(f.db).hir_fmt(f)
}
}
impl HirDisplay for TupleField {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
- write!(f, "pub {}: ", self.name().display(f.db.upcast(), f.edition()))?;
+ write!(f, "pub {}: ", self.name().display(f.db, f.edition()))?;
self.ty(f.db).hir_fmt(f)
}
}
impl HirDisplay for Variant {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
- write!(f, "{}", self.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", self.name(f.db).display(f.db, f.edition()))?;
let data = f.db.variant_fields(self.id.into());
match data.shape {
FieldsShape::Unit => {}
@@ -442,7 +441,7 @@ impl HirDisplay for ExternCrateDecl {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
write_visibility(self.module(f.db).id, self.visibility(f.db), f)?;
f.write_str("extern crate ")?;
- write!(f, "{}", self.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", self.name(f.db).display(f.db, f.edition()))?;
if let Some(alias) = self.alias(f.db) {
write!(f, " as {}", alias.display(f.edition()))?;
}
@@ -496,7 +495,7 @@ impl HirDisplay for TypeParam {
match param_data {
TypeOrConstParamData::TypeParamData(p) => match p.provenance {
TypeParamProvenance::TypeParamList | TypeParamProvenance::TraitSelf => {
- write!(f, "{}", p.name.clone().unwrap().display(f.db.upcast(), f.edition()))?
+ write!(f, "{}", p.name.clone().unwrap().display(f.db, f.edition()))?
}
TypeParamProvenance::ArgumentImplTrait => {
return write_bounds_like_dyn_trait_with_prefix(
@@ -509,7 +508,7 @@ impl HirDisplay for TypeParam {
}
},
TypeOrConstParamData::ConstParamData(p) => {
- write!(f, "{}", p.name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", p.name.display(f.db, f.edition()))?;
}
}
@@ -543,13 +542,13 @@ impl HirDisplay for TypeParam {
impl HirDisplay for LifetimeParam {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
- write!(f, "{}", self.name(f.db).display(f.db.upcast(), f.edition()))
+ write!(f, "{}", self.name(f.db).display(f.db, f.edition()))
}
}
impl HirDisplay for ConstParam {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
- write!(f, "const {}: ", self.name(f.db).display(f.db.upcast(), f.edition()))?;
+ write!(f, "const {}: ", self.name(f.db).display(f.db, f.edition()))?;
self.ty(f.db).hir_fmt(f)
}
}
@@ -581,7 +580,7 @@ fn write_generic_params(
};
for (_, lifetime) in params.iter_lt() {
delim(f)?;
- write!(f, "{}", lifetime.name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", lifetime.name.display(f.db, f.edition()))?;
}
for (_, ty) in params.iter_type_or_consts() {
if let Some(name) = &ty.name() {
@@ -591,7 +590,7 @@ fn write_generic_params(
continue;
}
delim(f)?;
- write!(f, "{}", name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}", name.display(f.db, f.edition()))?;
if let Some(default) = &ty.default {
f.write_str(" = ")?;
default.hir_fmt(f, &store)?;
@@ -599,7 +598,7 @@ fn write_generic_params(
}
TypeOrConstParamData::ConstParamData(c) => {
delim(f)?;
- write!(f, "const {}: ", name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "const {}: ", name.display(f.db, f.edition()))?;
c.ty.hir_fmt(f, &store)?;
if let Some(default) = &c.default {
@@ -657,7 +656,7 @@ fn write_where_predicates(
let write_target = |target: &WherePredicateTypeTarget, f: &mut HirFormatter<'_>| match target {
WherePredicateTypeTarget::TypeRef(ty) => ty.hir_fmt(f, store),
WherePredicateTypeTarget::TypeOrConstParam(id) => match params[*id].name() {
- Some(name) => write!(f, "{}", name.display(f.db.upcast(), f.edition())),
+ Some(name) => write!(f, "{}", name.display(f.db, f.edition())),
None => f.write_str("{unnamed}"),
},
};
@@ -691,8 +690,7 @@ fn write_where_predicates(
bound.hir_fmt(f, store)?;
}
ForLifetime { lifetimes, target, bound } => {
- let lifetimes =
- lifetimes.iter().map(|it| it.display(f.db.upcast(), f.edition())).join(", ");
+ let lifetimes = lifetimes.iter().map(|it| it.display(f.db, f.edition())).join(", ");
write!(f, "for<{lifetimes}> ")?;
write_target(target, f)?;
f.write_str(": ")?;
@@ -726,7 +724,7 @@ impl HirDisplay for Const {
let data = db.const_signature(self.id);
f.write_str("const ")?;
match &data.name {
- Some(name) => write!(f, "{}: ", name.display(f.db.upcast(), f.edition()))?,
+ Some(name) => write!(f, "{}: ", name.display(f.db, f.edition()))?,
None => f.write_str("_: ")?,
}
data.type_ref.hir_fmt(f, &data.store)?;
@@ -742,7 +740,7 @@ impl HirDisplay for Static {
if data.flags.contains(StaticFlags::MUTABLE) {
f.write_str("mut ")?;
}
- write!(f, "{}: ", data.name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "{}: ", data.name.display(f.db, f.edition()))?;
data.type_ref.hir_fmt(f, &data.store)?;
Ok(())
}
@@ -802,7 +800,7 @@ fn write_trait_header(trait_: &Trait, f: &mut HirFormatter<'_>) -> Result<(), Hi
if data.flags.contains(TraitFlags::IS_AUTO) {
f.write_str("auto ")?;
}
- write!(f, "trait {}", data.name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "trait {}", data.name.display(f.db, f.edition()))?;
write_generic_params(GenericDefId::TraitId(trait_.id), f)?;
Ok(())
}
@@ -811,7 +809,7 @@ impl HirDisplay for TraitAlias {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
write_visibility(self.module(f.db).id, self.visibility(f.db), f)?;
let data = f.db.trait_alias_signature(self.id);
- write!(f, "trait {}", data.name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "trait {}", data.name.display(f.db, f.edition()))?;
let def_id = GenericDefId::TraitAliasId(self.id);
write_generic_params(def_id, f)?;
f.write_str(" = ")?;
@@ -827,7 +825,7 @@ impl HirDisplay for TypeAlias {
fn hir_fmt(&self, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> {
write_visibility(self.module(f.db).id, self.visibility(f.db), f)?;
let data = f.db.type_alias_signature(self.id);
- write!(f, "type {}", data.name.display(f.db.upcast(), f.edition()))?;
+ write!(f, "type {}", data.name.display(f.db, f.edition()))?;
let def_id = GenericDefId::TypeAliasId(self.id);
write_generic_params(def_id, f)?;
if !data.bounds.is_empty() {
@@ -858,7 +856,7 @@ impl HirDisplay for Module {
}
}
match self.name(f.db) {
- Some(name) => write!(f, "mod {}", name.display(f.db.upcast(), f.edition())),
+ Some(name) => write!(f, "mod {}", name.display(f.db, f.edition())),
None => f.write_str("mod {unknown}"),
}
}
@@ -880,6 +878,6 @@ impl HirDisplay for Macro {
hir_def::MacroId::MacroRulesId(_) => f.write_str("macro_rules!"),
hir_def::MacroId::ProcMacroId(_) => f.write_str("proc_macro"),
}?;
- write!(f, " {}", self.name(f.db).display(f.db.upcast(), f.edition()))
+ write!(f, " {}", self.name(f.db).display(f.db, f.edition()))
}
}