mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #3763

Browse Source 
3763: Simplify r=matklad a=Veetaha



Co-authored-by: veetaha <veetaha2@gmail.com>
This commit is contained in:
bors[bot] 2020-03-30 09:57:40 +00:00 committed by GitHub
commit 3901198e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/ra_hir_ty/src/display.rs
View File

@ -159,20 +159,13 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> fmt::Result {
} }
TypeCtor::FnDef(def) => { TypeCtor::FnDef(def) => {
let sig = f.db.callable_item_signature(def).subst(&self.parameters); let sig = f.db.callable_item_signature(def).subst(&self.parameters);
let name = match def { match def {
CallableDef::FunctionId(ff) => f.db.function_data(ff).name.clone(), CallableDef::FunctionId(ff) => write!(f, "fn {}", f.db.function_data(ff).name)?,
CallableDef::StructId(s) => f.db.struct_data(s).name.clone(), CallableDef::StructId(s) => write!(f, "{}", f.db.struct_data(s).name)?,
CallableDef::EnumVariantId(e) => { CallableDef::EnumVariantId(e) => {
let enum_data = f.db.enum_data(e.parent); write!(f, "{}", f.db.enum_data(e.parent).variants[e.local_id].name)?
enum_data.variants[e.local_id].name.clone()
} }
}; };
match def {
CallableDef::FunctionId(_) => write!(f, "fn {}", name)?,
CallableDef::StructId(_) | CallableDef::EnumVariantId(_) => {
write!(f, "{}", name)?
}
}
if self.parameters.len() > 0 { if self.parameters.len() > 0 {
let generics = generics(f.db.upcast(), def.into()); let generics = generics(f.db.upcast(), def.into());
let (parent_params, self_param, type_params, _impl_trait_params) = let (parent_params, self_param, type_params, _impl_trait_params) =