mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't print bang diagnostics for derives

Browse source
This commit is contained in:
Manish Goregaokar 2020-06-10 00:38:13 -07:00
parent 27dcb4aab5
commit 178465516e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/passes/collect_intra_doc_links.rs
View file

@ -585,6 +585,9 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
} else if link.starts_with("macro@") { } else if link.starts_with("macro@") {
kind = Some(MacroNS); kind = Some(MacroNS);
link.trim_start_matches("macro@") link.trim_start_matches("macro@")
} else if link.starts_with("derive@") {
kind = Some(MacroNS);
link.trim_start_matches("derive@")
} else if link.ends_with('!') { } else if link.ends_with('!') {
kind = Some(MacroNS); kind = Some(MacroNS);
link.trim_end_matches('!') link.trim_end_matches('!')
@ -954,7 +957,7 @@ fn ambiguity_error(
Res::Def(DefKind::AssocFn | DefKind::Fn, _) => { Res::Def(DefKind::AssocFn | DefKind::Fn, _) => {
("add parentheses", format!("{}()", path_str)) ("add parentheses", format!("{}()", path_str))
} }
Res::Def(DefKind::Macro(..), _) => { Res::Def(DefKind::Macro(MacroKind::Bang), _) => {
("add an exclamation mark", format!("{}!", path_str)) ("add an exclamation mark", format!("{}!", path_str))
} }
_ => { _ => {
@ -968,6 +971,9 @@ fn ambiguity_error(
(Res::Def(DefKind::Mod, _), _) => "module", (Res::Def(DefKind::Mod, _), _) => "module",
(_, TypeNS) => "type", (_, TypeNS) => "type",
(_, ValueNS) => "value", (_, ValueNS) => "value",
(Res::Def(DefKind::Macro(MacroKind::Derive), _), MacroNS) => {
"derive"
}
(_, MacroNS) => "macro", (_, MacroNS) => "macro",
}; };