rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix NameRef::classify path resolution inside attributes

Browse Source
This commit is contained in:
Lukas Wirth
2021-06-28 18:33:42 +02:00
parent 9ef62b0ccd
commit 9957220dfe
4 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/syntax/src/display.rs
View File

@@ -77,19 +77,35 @@ pub fn type_label(node: &ast::TypeAlias) -> String {
}
pub fn macro_label(node: &ast::Macro) -> String {
let name = node.name().map(|name| name.syntax().text().to_string()).unwrap_or_default();
let name = node.name();
let mut s = String::new();
match node {
ast::Macro::MacroRules(node) => {
let vis = if node.has_atom_attr("macro_export") { "#[macro_export] " } else { "" };
format!("{}macro_rules! {}", vis, name)
format_to!(s, "{}macro_rules!", vis);
}
ast::Macro::MacroDef(node) => {
let mut s = String::new();
if let Some(vis) = node.visibility() {
format_to!(s, "{} ", vis);
}
format_to!(s, "macro {}", name);
s
format_to!(s, "macro");
}
}
if let Some(name) = name {
format_to!(s, " {}", name);
}
s
}
pub fn fn_as_proc_macro_label(node: &ast::Fn) -> String {
let name = node.name();
let mut s = String::new();
if let Some(vis) = node.visibility() {
format_to!(s, "{} ", vis);
}
format_to!(s, "macro");
if let Some(name) = name {
format_to!(s, " {}", name);
}
s
}