From 568f33c639b484a1589a926f79e0b47f80a78d2d Mon Sep 17 00:00:00 2001 From: xizheyin Date: Fri, 28 Feb 2025 14:23:12 +0800 Subject: [PATCH] recovery tests Signed-off-by: xizheyin --- tests/rustdoc/reexport-attr-merge.rs | 3 +++ tests/rustdoc/reexport-doc-hidden.rs | 1 + tests/rustdoc/reexport-of-doc-hidden.rs | 13 +++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/rustdoc/reexport-attr-merge.rs b/tests/rustdoc/reexport-attr-merge.rs index 82a03976444b9..aef302eb0b29a 100644 --- a/tests/rustdoc/reexport-attr-merge.rs +++ b/tests/rustdoc/reexport-attr-merge.rs @@ -12,8 +12,10 @@ pub struct Foo; #[doc(hidden, no_inline, cfg(feature = "bar"))] pub use Foo as Foo1; + #[doc(hidden, inline)] pub use Foo1 as Foo2; + // First we ensure that only the reexport `Bar2` and the inlined struct `Bar` // are inlined. //@ count - '//a[@class="struct"]' 1 @@ -24,6 +26,7 @@ pub use Foo1 as Foo2; //@ has - '//a[@class="struct"]' 'Bar' #[doc(inline)] pub use Foo2 as Bar; + // This one should appear but `Bar2` won't be linked because there is no // `#[doc(inline)]`. //@ !has - '//*[@id="reexport.Bar2"]' 'pub use Foo2 as Bar2;' diff --git a/tests/rustdoc/reexport-doc-hidden.rs b/tests/rustdoc/reexport-doc-hidden.rs index 37a3018a51a08..1468e9ad957f7 100644 --- a/tests/rustdoc/reexport-doc-hidden.rs +++ b/tests/rustdoc/reexport-doc-hidden.rs @@ -10,6 +10,7 @@ pub type Type = u32; //@ has 'foo/index.html' //@ !has - '//*[@id="reexport.Type2"]/code' 'pub use crate::Type as Type2;' pub use crate::Type as Type2; + //@ count - '//*[@id="reexport.Type3"]' 0 #[doc(hidden)] pub use crate::Type as Type3; diff --git a/tests/rustdoc/reexport-of-doc-hidden.rs b/tests/rustdoc/reexport-of-doc-hidden.rs index 76e7ce51e1673..f9e3150b74845 100644 --- a/tests/rustdoc/reexport-of-doc-hidden.rs +++ b/tests/rustdoc/reexport-of-doc-hidden.rs @@ -13,13 +13,14 @@ 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 use crate::foo as Macro; -//@ !has - '//*[@id="reexport.Macro2"]/code' 'pub use crate::foo as Macro2;' -pub use crate::foo as Macro2; + pub fn fofo() {} @@ -31,11 +32,11 @@ 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; - pub use crate::foo as Macro; - //@ has - '//*[@id="reexport.Macro2"]/code' 'pub use crate::foo as Macro2;' - pub use crate::foo as Macro2; }