bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #52581 - petrochenkov:bmacrodoc, r=alexcrichton

Browse source 
Avoid using `#[macro_export]` for documenting builtin macros

Use a special `rustc_*` attribute instead.

cc https://github.com/rust-lang/rust/pull/52234
This commit is contained in:
kennytm 2018-07-22 22:10:16 +08:00
commit 8e6971dd2d
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
5 changed files with 43 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustdoc/clean/mod.rs
View file

@ -1273,15 +1273,13 @@ fn macro_resolve(cx: &DocContext, path_str: &str) -> Option<Def> {
.resolve_macro_to_def_inner(mark, &path, MacroKind::Bang, false);
if let Ok(def) = res {
if let SyntaxExtension::DeclMacro { .. } = *resolver.get_macro(def) {
Some(def)
} else {
None
return Some(def);
}
} else if let Some(def) = resolver.all_macros.get(&Symbol::intern(path_str)) {
Some(*def)
} else {
None
}
if let Some(def) = resolver.all_macros.get(&Symbol::intern(path_str)) {
return Some(*def);
}
None
}
#[derive(Debug)]