bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/doc_links.rs')
-rw-r--r--crates/ide/src/doc_links.rs49
1 files changed, 22 insertions, 27 deletions
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index bc9843f3f3..cfd8919730 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -413,8 +413,7 @@ fn rewrite_url_link(db: &RootDatabase, def: Definition, target: &str) -> Option<
fn mod_path_of_def(db: &RootDatabase, def: Definition) -> Option<String> {
def.canonical_module_path(db).map(|it| {
let mut path = String::new();
- it.flat_map(|it| it.name(db))
- .for_each(|name| format_to!(path, "{}/", name.unescaped().display(db)));
+ it.flat_map(|it| it.name(db)).for_each(|name| format_to!(path, "{}/", name.as_str()));
path
})
}
@@ -590,10 +589,10 @@ fn filename_and_frag_for_def(
let res = match def {
Definition::Adt(adt) => match adt {
Adt::Struct(s) => {
- format!("struct.{}.html", s.name(db).unescaped().display(db.upcast()))
+ format!("struct.{}.html", s.name(db).as_str())
}
- Adt::Enum(e) => format!("enum.{}.html", e.name(db).unescaped().display(db.upcast())),
- Adt::Union(u) => format!("union.{}.html", u.name(db).unescaped().display(db.upcast())),
+ Adt::Enum(e) => format!("enum.{}.html", e.name(db).as_str()),
+ Adt::Union(u) => format!("union.{}.html", u.name(db).as_str()),
},
Definition::Crate(_) => String::from("index.html"),
Definition::Module(m) => match m.name(db) {
@@ -603,48 +602,48 @@ fn filename_and_frag_for_def(
Some(kw) => {
format!("keyword.{}.html", kw)
}
- None => format!("{}/index.html", name.unescaped().display(db.upcast())),
+ None => format!("{}/index.html", name.as_str()),
}
}
None => String::from("index.html"),
},
Definition::Trait(t) => {
- format!("trait.{}.html", t.name(db).unescaped().display(db.upcast()))
+ format!("trait.{}.html", t.name(db).as_str())
}
Definition::TraitAlias(t) => {
- format!("traitalias.{}.html", t.name(db).unescaped().display(db.upcast()))
+ format!("traitalias.{}.html", t.name(db).as_str())
}
Definition::TypeAlias(t) => {
- format!("type.{}.html", t.name(db).unescaped().display(db.upcast()))
+ format!("type.{}.html", t.name(db).as_str())
}
Definition::BuiltinType(t) => {
- format!("primitive.{}.html", t.name().unescaped().display(db.upcast()))
+ format!("primitive.{}.html", t.name().as_str())
}
Definition::Function(f) => {
- format!("fn.{}.html", f.name(db).unescaped().display(db.upcast()))
+ format!("fn.{}.html", f.name(db).as_str())
}
Definition::Variant(ev) => {
format!(
"enum.{}.html#variant.{}",
- ev.parent_enum(db).name(db).unescaped().display(db.upcast()),
- ev.name(db).unescaped().display(db.upcast())
+ ev.parent_enum(db).name(db).as_str(),
+ ev.name(db).as_str()
)
}
Definition::Const(c) => {
- format!("const.{}.html", c.name(db)?.unescaped().display(db.upcast()))
+ format!("const.{}.html", c.name(db)?.as_str())
}
Definition::Static(s) => {
- format!("static.{}.html", s.name(db).unescaped().display(db.upcast()))
+ format!("static.{}.html", s.name(db).as_str())
}
Definition::Macro(mac) => match mac.kind(db) {
hir::MacroKind::Declarative
| hir::MacroKind::BuiltIn
| hir::MacroKind::Attr
| hir::MacroKind::ProcMacro => {
- format!("macro.{}.html", mac.name(db).unescaped().display(db.upcast()))
+ format!("macro.{}.html", mac.name(db).as_str())
}
hir::MacroKind::Derive => {
- format!("derive.{}.html", mac.name(db).unescaped().display(db.upcast()))
+ format!("derive.{}.html", mac.name(db).as_str())
}
},
Definition::Field(field) => {
@@ -654,11 +653,7 @@ fn filename_and_frag_for_def(
hir::VariantDef::Variant(it) => Definition::Variant(it),
};
let (_, file, _) = filename_and_frag_for_def(db, def)?;
- return Some((
- def,
- file,
- Some(format!("structfield.{}", field.name(db).unescaped().display(db.upcast()))),
- ));
+ return Some((def, file, Some(format!("structfield.{}", field.name(db).as_str()))));
}
Definition::SelfType(impl_) => {
let adt = impl_.self_ty(db).as_adt()?.into();
@@ -667,7 +662,7 @@ fn filename_and_frag_for_def(
return Some((adt, file, Some(String::from("impl"))));
}
Definition::ExternCrateDecl(it) => {
- format!("{}/index.html", it.name(db).unescaped().display(db.upcast()))
+ format!("{}/index.html", it.name(db).as_str())
}
Definition::Local(_)
| Definition::GenericParam(_)
@@ -699,16 +694,16 @@ fn get_assoc_item_fragment(db: &dyn HirDatabase, assoc_item: hir::AssocItem) ->
// Rustdoc makes this decision based on whether a method 'has defaultness'.
// Currently this is only the case for provided trait methods.
if is_trait_method && !function.has_body(db) {
- format!("tymethod.{}", function.name(db).unescaped().display(db.upcast()))
+ format!("tymethod.{}", function.name(db).as_str())
} else {
- format!("method.{}", function.name(db).unescaped().display(db.upcast()))
+ format!("method.{}", function.name(db).as_str())
}
}
AssocItem::Const(constant) => {
- format!("associatedconstant.{}", constant.name(db)?.unescaped().display(db.upcast()))
+ format!("associatedconstant.{}", constant.name(db)?.as_str())
}
AssocItem::TypeAlias(ty) => {
- format!("associatedtype.{}", ty.name(db).unescaped().display(db.upcast()))
+ format!("associatedtype.{}", ty.name(db).as_str())
}
})
}