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

Correctly handle multiple re-exports of bang macros at the same level

Browse Source
This commit is contained in:
Guillaume Gomez 2023-05-26 23:53:14 +02:00
parent c908d1e4de
commit 898dfc680f
3 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustdoc/visit_ast.rs
View File

@ -305,7 +305,12 @@ fn maybe_inline_local(
return false;
}
if !self.view_item_stack.insert(res_did) {
let is_bang_macro = matches!(
tcx.hir().get_by_def_id(res_did),
Node::Item(&hir::Item { kind: hir::ItemKind::Macro(_, MacroKind::Bang), .. })
);
if !self.view_item_stack.insert(res_did) && !is_bang_macro {
return false;
}
@ -313,8 +318,9 @@ fn maybe_inline_local(
// Bang macros are handled a bit on their because of how they are handled by the
// compiler. If they have `#[doc(hidden)]` and the re-export doesn't have
// `#[doc(inline)]`, then we don't inline it.
Node::Item(&hir::Item { kind: hir::ItemKind::Macro(_, MacroKind::Bang), .. })
if !please_inline
Node::Item(_)
if is_bang_macro
&& !please_inline
&& renamed.is_some()
&& self.cx.tcx.is_doc_hidden(ori_res_did) =>
{

2
tests/rustdoc/reexport-hidden-macro.rs
View File

@ -5,6 +5,7 @@
// @has 'foo/index.html'
// @has - '//*[@id="main-content"]//a[@href="macro.Macro2.html"]' 'Macro2'
// @has - '//*[@id="reexport.Macro"]/code' 'pub use crate::foo as Macro;'
// @has 'foo/macro.Macro2.html'
// @has - '//*[@class="docblock"]' 'Displayed'
@ -15,7 +16,6 @@ macro_rules! foo {
() => {};
}
// @has - '//*[@id="reexport.Macro"]/code' 'pub use crate::foo as Macro;'
pub use crate::foo as Macro;
/// Displayed
#[doc(inline)]

42
tests/rustdoc/reexport-of-doc-hidden.rs Normal file
View File

@ -0,0 +1,42 @@
// This test ensures that all re-exports of doc hidden elements are displayed.
#![crate_name = "foo"]
#[doc(hidden)]
pub struct Bar;
#[macro_export]
#[doc(hidden)]
macro_rules! foo {
() => {};
}
// @has 'foo/index.html'
// @has - '//*[@id="reexport.Macro"]/code' 'pub use crate::foo as Macro;'
pub use crate::foo as Macro;
// @has - '//*[@id="reexport.Macro2"]/code' 'pub use crate::foo as Macro2;'
pub use crate::foo as Macro2;
// @has - '//*[@id="reexport.Boo"]/code' 'pub use crate::Bar as Boo;'
pub use crate::Bar as Boo;
// @has - '//*[@id="reexport.Boo2"]/code' 'pub use crate::Bar as Boo2;'
pub use crate::Bar as Boo2;
pub fn fofo() {}
// @has - '//*[@id="reexport.f1"]/code' 'pub use crate::fofo as f1;'
pub use crate::fofo as f1;
// @has - '//*[@id="reexport.f2"]/code' 'pub use crate::fofo as f2;'
pub use crate::fofo as f2;
pub mod sub {
// @has 'foo/sub/index.html'
// @has - '//*[@id="reexport.Macro"]/code' 'pub use crate::foo as Macro;'
pub use crate::foo as Macro;
// @has - '//*[@id="reexport.Macro2"]/code' 'pub use crate::foo as Macro2;'
pub use crate::foo as Macro2;
// @has - '//*[@id="reexport.f1"]/code' 'pub use crate::fofo as f1;'
pub use crate::fofo as f1;
// @has - '//*[@id="reexport.f2"]/code' 'pub use crate::fofo as f2;'
pub use crate::fofo as f2;
}