bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/tls.rs')
-rw-r--r--crates/hir-ty/src/tls.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/hir-ty/src/tls.rs b/crates/hir-ty/src/tls.rs
index 19458fc654..c8b64f7cbc 100644
--- a/crates/hir-ty/src/tls.rs
+++ b/crates/hir-ty/src/tls.rs
@@ -25,7 +25,7 @@ impl DebugContext<'_> {
AdtId::UnionId(it) => self.0.union_signature(it).name.clone(),
AdtId::EnumId(it) => self.0.enum_signature(it).name.clone(),
};
- name.display(self.0.upcast(), Edition::LATEST).fmt(f)?;
+ name.display(self.0, Edition::LATEST).fmt(f)?;
Ok(())
}
@@ -36,7 +36,7 @@ impl DebugContext<'_> {
) -> Result<(), fmt::Error> {
let trait_: hir_def::TraitId = from_chalk_trait_id(id);
let trait_data = self.0.trait_signature(trait_);
- trait_data.name.display(self.0.upcast(), Edition::LATEST).fmt(f)?;
+ trait_data.name.display(self.0, Edition::LATEST).fmt(f)?;
Ok(())
}
@@ -47,7 +47,7 @@ impl DebugContext<'_> {
) -> Result<(), fmt::Error> {
let type_alias: TypeAliasId = from_assoc_type_id(id);
let type_alias_data = self.0.type_alias_signature(type_alias);
- let trait_ = match type_alias.lookup(self.0.upcast()).container {
+ let trait_ = match type_alias.lookup(self.0).container {
ItemContainerId::TraitId(t) => t,
_ => panic!("associated type not in trait"),
};
@@ -55,8 +55,8 @@ impl DebugContext<'_> {
write!(
fmt,
"{}::{}",
- trait_data.name.display(self.0.upcast(), Edition::LATEST),
- type_alias_data.name.display(self.0.upcast(), Edition::LATEST)
+ trait_data.name.display(self.0, Edition::LATEST),
+ type_alias_data.name.display(self.0, Edition::LATEST)
)?;
Ok(())
}
@@ -68,7 +68,7 @@ impl DebugContext<'_> {
) -> Result<(), fmt::Error> {
let type_alias = from_assoc_type_id(projection_ty.associated_ty_id);
let type_alias_data = self.0.type_alias_signature(type_alias);
- let trait_ = match type_alias.lookup(self.0.upcast()).container {
+ let trait_ = match type_alias.lookup(self.0).container {
ItemContainerId::TraitId(t) => t,
_ => panic!("associated type not in trait"),
};
@@ -76,7 +76,7 @@ impl DebugContext<'_> {
let trait_ref = projection_ty.trait_ref(self.0);
let trait_params = trait_ref.substitution.as_slice(Interner);
let self_ty = trait_ref.self_type_parameter(Interner);
- write!(fmt, "<{self_ty:?} as {}", trait_name.display(self.0.upcast(), Edition::LATEST))?;
+ write!(fmt, "<{self_ty:?} as {}", trait_name.display(self.0, Edition::LATEST))?;
if trait_params.len() > 1 {
write!(
fmt,
@@ -84,7 +84,7 @@ impl DebugContext<'_> {
trait_params[1..].iter().format_with(", ", |x, f| f(&format_args!("{x:?}"))),
)?;
}
- write!(fmt, ">::{}", type_alias_data.name.display(self.0.upcast(), Edition::LATEST))?;
+ write!(fmt, ">::{}", type_alias_data.name.display(self.0, Edition::LATEST))?;
let proj_params_count = projection_ty.substitution.len(Interner) - trait_params.len();
let proj_params = &projection_ty.substitution.as_slice(Interner)[..proj_params_count];
@@ -109,16 +109,16 @@ impl DebugContext<'_> {
CallableDefId::FunctionId(ff) => self.0.function_signature(ff).name.clone(),
CallableDefId::StructId(s) => self.0.struct_signature(s).name.clone(),
CallableDefId::EnumVariantId(e) => {
- let loc = e.lookup(self.0.upcast());
+ let loc = e.lookup(self.0);
self.0.enum_variants(loc.parent).variants[loc.index as usize].1.clone()
}
};
match def {
CallableDefId::FunctionId(_) => {
- write!(fmt, "{{fn {}}}", name.display(self.0.upcast(), Edition::LATEST))
+ write!(fmt, "{{fn {}}}", name.display(self.0, Edition::LATEST))
}
CallableDefId::StructId(_) | CallableDefId::EnumVariantId(_) => {
- write!(fmt, "{{ctor {}}}", name.display(self.0.upcast(), Edition::LATEST))
+ write!(fmt, "{{ctor {}}}", name.display(self.0, Edition::LATEST))
}
}
}