From 1b67035579fc6157ca2f3fb8b7e6071ff6d888bc Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Fri, 21 Jun 2024 14:03:08 +0200 Subject: Update `tests/rustdoc` to new test syntax --- .../blanket-impl-reexported-trait-94183.rs | 8 +-- .../inline_local/enum-variant-reexport-46766.rs | 2 +- .../glob-extern-document-private-items.rs | 22 ++++---- tests/rustdoc/inline_local/glob-extern.rs | 18 +++--- .../glob-private-document-private-items.rs | 58 ++++++++++---------- tests/rustdoc/inline_local/glob-private.rs | 50 ++++++++--------- tests/rustdoc/inline_local/hidden-use.rs | 8 +-- tests/rustdoc/inline_local/issue-28537.rs | 4 +- tests/rustdoc/inline_local/issue-32343.rs | 18 +++--- tests/rustdoc/inline_local/macro_by_example.rs | 12 ++-- tests/rustdoc/inline_local/please_inline.rs | 12 ++-- .../private-reexport-in-public-api-81141-2.rs | 4 +- .../private-reexport-in-public-api-81141.rs | 64 +++++++++++----------- ...rivate-reexport-in-public-api-generics-81141.rs | 4 +- .../private-reexport-in-public-api-hidden-81141.rs | 4 +- ...private-reexport-in-public-api-private-81141.rs | 12 ++-- ...xported-macro-and-macro-export-sidebar-89852.rs | 4 +- tests/rustdoc/inline_local/trait-vis.rs | 6 +- 18 files changed, 155 insertions(+), 155 deletions(-) (limited to 'tests/rustdoc/inline_local') diff --git a/tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs b/tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs index 343e030da9e..66d313a4506 100644 --- a/tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs +++ b/tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs @@ -5,28 +5,28 @@ // https://github.com/rust-lang/rust/issues/94183 #![crate_name = "foo"] -// @has 'foo/struct.S.html' +//@ has 'foo/struct.S.html' mod actual_sub { pub trait Actual {} pub trait Another {} // `Another` is publicly re-exported so it should appear in the blanket impl list. - // @has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl Another for T' + //@ has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl Another for T' impl Another for T {} trait Foo {} // `Foo` is not publicly re-exported nor reachable so it shouldn't appear in the // blanket impl list. - // @!has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl Foo for T' + //@ !has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl Foo for T' impl Foo for T {} } pub use actual_sub::{Actual, Another}; // `Actual` is publicly re-exported so it should appear in the blanket impl list. -// @has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl Actual for T' +//@ has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl Actual for T' impl Actual for T {} pub struct S; diff --git a/tests/rustdoc/inline_local/enum-variant-reexport-46766.rs b/tests/rustdoc/inline_local/enum-variant-reexport-46766.rs index ea6b7bac4c7..8a41f9d1fc5 100644 --- a/tests/rustdoc/inline_local/enum-variant-reexport-46766.rs +++ b/tests/rustdoc/inline_local/enum-variant-reexport-46766.rs @@ -4,4 +4,4 @@ pub enum Enum{Variant} pub use self::Enum::Variant; -// @!has foo/index.html '//a/@href' './Enum/index.html' +//@ !has foo/index.html '//a/@href' './Enum/index.html' diff --git a/tests/rustdoc/inline_local/glob-extern-document-private-items.rs b/tests/rustdoc/inline_local/glob-extern-document-private-items.rs index 9a11f88c81a..f58474bf5f9 100644 --- a/tests/rustdoc/inline_local/glob-extern-document-private-items.rs +++ b/tests/rustdoc/inline_local/glob-extern-document-private-items.rs @@ -11,15 +11,15 @@ mod mod1 { pub use mod1::*; -// @has foo/index.html -// @hasraw - "mod1" -// @hasraw - "public_fn" -// @!hasraw - "private_fn" -// @has foo/fn.public_fn.html -// @!has foo/fn.private_fn.html +//@ has foo/index.html +//@ hasraw - "mod1" +//@ hasraw - "public_fn" +//@ !hasraw - "private_fn" +//@ has foo/fn.public_fn.html +//@ !has foo/fn.private_fn.html -// @has foo/mod1/index.html -// @hasraw - "public_fn" -// @hasraw - "private_fn" -// @has foo/mod1/fn.public_fn.html -// @has foo/mod1/fn.private_fn.html +//@ has foo/mod1/index.html +//@ hasraw - "public_fn" +//@ hasraw - "private_fn" +//@ has foo/mod1/fn.public_fn.html +//@ has foo/mod1/fn.private_fn.html diff --git a/tests/rustdoc/inline_local/glob-extern.rs b/tests/rustdoc/inline_local/glob-extern.rs index c592a4db19d..5e7a631ad18 100644 --- a/tests/rustdoc/inline_local/glob-extern.rs +++ b/tests/rustdoc/inline_local/glob-extern.rs @@ -9,13 +9,13 @@ mod mod1 { pub use mod1::*; -// @has foo/index.html -// @!hasraw - "mod1" -// @hasraw - "public_fn" -// @!hasraw - "private_fn" -// @has foo/fn.public_fn.html -// @!has foo/fn.private_fn.html +//@ has foo/index.html +//@ !hasraw - "mod1" +//@ hasraw - "public_fn" +//@ !hasraw - "private_fn" +//@ has foo/fn.public_fn.html +//@ !has foo/fn.private_fn.html -// @!has foo/mod1/index.html -// @has foo/mod1/fn.public_fn.html -// @!has foo/mod1/fn.private_fn.html +//@ !has foo/mod1/index.html +//@ has foo/mod1/fn.public_fn.html +//@ !has foo/mod1/fn.private_fn.html diff --git a/tests/rustdoc/inline_local/glob-private-document-private-items.rs b/tests/rustdoc/inline_local/glob-private-document-private-items.rs index 4ad217d2270..4ad36da843f 100644 --- a/tests/rustdoc/inline_local/glob-private-document-private-items.rs +++ b/tests/rustdoc/inline_local/glob-private-document-private-items.rs @@ -14,35 +14,35 @@ mod mod1 { } pub use mod1::*; -// @has foo/index.html -// @hasraw - "mod1" -// @hasraw - "Mod1Public" -// @!hasraw - "Mod1Private" -// @!hasraw - "mod2" -// @hasraw - "Mod2Public" -// @!hasraw - "Mod2Private" -// @has foo/struct.Mod1Public.html -// @!has foo/struct.Mod1Private.html -// @has foo/struct.Mod2Public.html -// @!has foo/struct.Mod2Private.html +//@ has foo/index.html +//@ hasraw - "mod1" +//@ hasraw - "Mod1Public" +//@ !hasraw - "Mod1Private" +//@ !hasraw - "mod2" +//@ hasraw - "Mod2Public" +//@ !hasraw - "Mod2Private" +//@ has foo/struct.Mod1Public.html +//@ !has foo/struct.Mod1Private.html +//@ has foo/struct.Mod2Public.html +//@ !has foo/struct.Mod2Private.html -// @has foo/mod1/index.html -// @hasraw - "mod2" -// @hasraw - "Mod1Public" -// @hasraw - "Mod1Private" -// @!hasraw - "Mod2Public" -// @!hasraw - "Mod2Private" -// @has foo/mod1/struct.Mod1Public.html -// @has foo/mod1/struct.Mod1Private.html -// @!has foo/mod1/struct.Mod2Public.html -// @!has foo/mod1/struct.Mod2Private.html +//@ has foo/mod1/index.html +//@ hasraw - "mod2" +//@ hasraw - "Mod1Public" +//@ hasraw - "Mod1Private" +//@ !hasraw - "Mod2Public" +//@ !hasraw - "Mod2Private" +//@ has foo/mod1/struct.Mod1Public.html +//@ has foo/mod1/struct.Mod1Private.html +//@ !has foo/mod1/struct.Mod2Public.html +//@ !has foo/mod1/struct.Mod2Private.html -// @has foo/mod1/mod2/index.html -// @hasraw - "Mod2Public" -// @hasraw - "Mod2Private" -// @has foo/mod1/mod2/struct.Mod2Public.html -// @has foo/mod1/mod2/struct.Mod2Private.html +//@ has foo/mod1/mod2/index.html +//@ hasraw - "Mod2Public" +//@ hasraw - "Mod2Private" +//@ has foo/mod1/mod2/struct.Mod2Public.html +//@ has foo/mod1/mod2/struct.Mod2Private.html -// @!has foo/mod2/index.html -// @!has foo/mod2/struct.Mod2Public.html -// @!has foo/mod2/struct.Mod2Private.html +//@ !has foo/mod2/index.html +//@ !has foo/mod2/struct.Mod2Public.html +//@ !has foo/mod2/struct.Mod2Private.html diff --git a/tests/rustdoc/inline_local/glob-private.rs b/tests/rustdoc/inline_local/glob-private.rs index 303f1d61048..d6499d27a25 100644 --- a/tests/rustdoc/inline_local/glob-private.rs +++ b/tests/rustdoc/inline_local/glob-private.rs @@ -12,31 +12,31 @@ mod mod1 { } pub use mod1::*; -// @has foo/index.html -// @!hasraw - "mod1" -// @hasraw - "Mod1Public" -// @!hasraw - "Mod1Private" -// @!hasraw - "mod2" -// @hasraw - "Mod2Public" -// @!hasraw - "Mod2Private" -// @has foo/struct.Mod1Public.html -// @!has foo/struct.Mod1Private.html -// @has foo/struct.Mod2Public.html -// @!has foo/struct.Mod2Private.html +//@ has foo/index.html +//@ !hasraw - "mod1" +//@ hasraw - "Mod1Public" +//@ !hasraw - "Mod1Private" +//@ !hasraw - "mod2" +//@ hasraw - "Mod2Public" +//@ !hasraw - "Mod2Private" +//@ has foo/struct.Mod1Public.html +//@ !has foo/struct.Mod1Private.html +//@ has foo/struct.Mod2Public.html +//@ !has foo/struct.Mod2Private.html -// @has-dir foo/mod1 -// @!has foo/mod1/index.html -// @has foo/mod1/struct.Mod1Public.html -// @!has foo/mod1/struct.Mod1Private.html -// @!has foo/mod1/struct.Mod2Public.html -// @!has foo/mod1/struct.Mod2Private.html +//@ has-dir foo/mod1 +//@ !has foo/mod1/index.html +//@ has foo/mod1/struct.Mod1Public.html +//@ !has foo/mod1/struct.Mod1Private.html +//@ !has foo/mod1/struct.Mod2Public.html +//@ !has foo/mod1/struct.Mod2Private.html -// @has-dir foo/mod1/mod2 -// @!has foo/mod1/mod2/index.html -// @has foo/mod1/mod2/struct.Mod2Public.html -// @!has foo/mod1/mod2/struct.Mod2Private.html +//@ has-dir foo/mod1/mod2 +//@ !has foo/mod1/mod2/index.html +//@ has foo/mod1/mod2/struct.Mod2Public.html +//@ !has foo/mod1/mod2/struct.Mod2Private.html -// @!has-dir foo/mod2 -// @!has foo/mod2/index.html -// @!has foo/mod2/struct.Mod2Public.html -// @!has foo/mod2/struct.Mod2Private.html +//@ !has-dir foo/mod2 +//@ !has foo/mod2/index.html +//@ !has foo/mod2/struct.Mod2Public.html +//@ !has foo/mod2/struct.Mod2Private.html diff --git a/tests/rustdoc/inline_local/hidden-use.rs b/tests/rustdoc/inline_local/hidden-use.rs index de512fb26e6..35bce2932f9 100644 --- a/tests/rustdoc/inline_local/hidden-use.rs +++ b/tests/rustdoc/inline_local/hidden-use.rs @@ -2,9 +2,9 @@ mod private { pub struct Foo {} } -// @has hidden_use/index.html -// @!hasraw - 'private' -// @!hasraw - 'Foo' -// @!has hidden_use/struct.Foo.html +//@ has hidden_use/index.html +//@ !hasraw - 'private' +//@ !hasraw - 'Foo' +//@ !has hidden_use/struct.Foo.html #[doc(hidden)] pub use private::Foo; diff --git a/tests/rustdoc/inline_local/issue-28537.rs b/tests/rustdoc/inline_local/issue-28537.rs index da9cc4c940d..d5ba94d2e6c 100644 --- a/tests/rustdoc/inline_local/issue-28537.rs +++ b/tests/rustdoc/inline_local/issue-28537.rs @@ -10,8 +10,8 @@ mod bar { } } -// @has issue_28537/struct.Foo.html +//@ has issue_28537/struct.Foo.html pub use foo::Foo; -// @has issue_28537/struct.Bar.html +//@ has issue_28537/struct.Bar.html pub use self::bar::Bar; diff --git a/tests/rustdoc/inline_local/issue-32343.rs b/tests/rustdoc/inline_local/issue-32343.rs index 5620ae0dced..2ec123fdc5c 100644 --- a/tests/rustdoc/inline_local/issue-32343.rs +++ b/tests/rustdoc/inline_local/issue-32343.rs @@ -1,14 +1,14 @@ -// @!has issue_32343/struct.Foo.html -// @has issue_32343/index.html -// @has - '//code' 'pub use foo::Foo' -// @!has - '//code/a' 'Foo' +//@ !has issue_32343/struct.Foo.html +//@ has issue_32343/index.html +//@ has - '//code' 'pub use foo::Foo' +//@ !has - '//code/a' 'Foo' #[doc(no_inline)] pub use foo::Foo; -// @!has issue_32343/struct.Bar.html -// @has issue_32343/index.html -// @has - '//code' 'pub use foo::Bar' -// @has - '//code/a' 'Bar' +//@ !has issue_32343/struct.Bar.html +//@ has issue_32343/index.html +//@ has - '//code' 'pub use foo::Bar' +//@ has - '//code/a' 'Bar' #[doc(no_inline)] pub use foo::Bar; @@ -18,6 +18,6 @@ mod foo { } pub mod bar { - // @has issue_32343/bar/struct.Bar.html + //@ has issue_32343/bar/struct.Bar.html pub use ::foo::Bar; } diff --git a/tests/rustdoc/inline_local/macro_by_example.rs b/tests/rustdoc/inline_local/macro_by_example.rs index 5c33c0037e4..584a149968e 100644 --- a/tests/rustdoc/inline_local/macro_by_example.rs +++ b/tests/rustdoc/inline_local/macro_by_example.rs @@ -5,13 +5,13 @@ macro_rules! foo { ($($tt:tt)*) => {} } -// @has macro_by_example/macros/index.html +//@ has macro_by_example/macros/index.html pub mod macros { - // @!hasraw - 'pub use foo as bar;' - // @has macro_by_example/macros/macro.bar.html - // @has - '//*[@class="docblock"]' 'docs for foo' - // @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.2.3: text' - // @has - '//a/@href' 'macro_by_example.rs.html#4-6' + //@ !hasraw - 'pub use foo as bar;' + //@ has macro_by_example/macros/macro.bar.html + //@ has - '//*[@class="docblock"]' 'docs for foo' + //@ has - '//*[@class="stab deprecated"]' 'Deprecated since 1.2.3: text' + //@ has - '//a/@href' 'macro_by_example.rs.html#4-6' #[doc(inline)] pub use foo as bar; } diff --git a/tests/rustdoc/inline_local/please_inline.rs b/tests/rustdoc/inline_local/please_inline.rs index e4429ef33a9..ad7a30012a8 100644 --- a/tests/rustdoc/inline_local/please_inline.rs +++ b/tests/rustdoc/inline_local/please_inline.rs @@ -2,18 +2,18 @@ pub mod foo { pub struct Foo; } -// @has please_inline/a/index.html +//@ has please_inline/a/index.html pub mod a { - // @!hasraw - 'pub use foo::' - // @has please_inline/a/struct.Foo.html + //@ !hasraw - 'pub use foo::' + //@ has please_inline/a/struct.Foo.html #[doc(inline)] pub use foo::Foo; } -// @has please_inline/b/index.html +//@ has please_inline/b/index.html pub mod b { - // @hasraw - 'pub use foo::' - // @!has please_inline/b/struct.Foo.html + //@ hasraw - 'pub use foo::' + //@ !has please_inline/b/struct.Foo.html #[feature(inline)] pub use foo::Foo; } diff --git a/tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs index c066f54b32b..9dcdc6a0f34 100644 --- a/tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs +++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs @@ -8,7 +8,7 @@ use external::Public as Private; pub mod external { pub struct Public; - // @has 'foo/external/fn.make.html' - // @has - '//*[@class="rust item-decl"]/code' 'pub fn make() -> Public' + //@ has 'foo/external/fn.make.html' + //@ has - '//*[@class="rust item-decl"]/code' 'pub fn make() -> Public' pub fn make() -> ::Private { super::Private } } diff --git a/tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs index d695ed7fbfa..55d95c32ce2 100644 --- a/tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs +++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs @@ -16,57 +16,57 @@ mod bar { pub use self::Bar as Inner; } -// @has 'foo/fn.bar.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar() -> Bar' +//@ has 'foo/fn.bar.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar() -> Bar' pub fn bar() -> Alias { Alias } -// @has 'foo/fn.bar2.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar2() -> Whatever' +//@ has 'foo/fn.bar2.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar2() -> Whatever' pub fn bar2() -> Whatever3 { Whatever } -// @has 'foo/fn.bar3.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar3() -> Whatever4' +//@ has 'foo/fn.bar3.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar3() -> Whatever4' pub fn bar3() -> Whatever4 { Whatever } -// @has 'foo/fn.bar4.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar4() -> Bar' +//@ has 'foo/fn.bar4.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar4() -> Bar' pub fn bar4() -> crate::Alias { Alias } -// @has 'foo/fn.bar5.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar5() -> Whatever' +//@ has 'foo/fn.bar5.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar5() -> Whatever' pub fn bar5() -> crate::Whatever3 { Whatever } -// @has 'foo/fn.bar6.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar6() -> Whatever4' +//@ has 'foo/fn.bar6.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar6() -> Whatever4' pub fn bar6() -> crate::Whatever4 { Whatever } -// @has 'foo/fn.bar7.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar7() -> Bar' +//@ has 'foo/fn.bar7.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar7() -> Bar' pub fn bar7() -> self::Alias { Alias } -// @has 'foo/fn.bar8.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar8() -> Whatever' +//@ has 'foo/fn.bar8.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar8() -> Whatever' pub fn bar8() -> self::Whatever3 { Whatever } -// @has 'foo/fn.bar9.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar9() -> Whatever4' +//@ has 'foo/fn.bar9.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar9() -> Whatever4' pub fn bar9() -> self::Whatever4 { Whatever } @@ -78,38 +78,38 @@ mod nested { pub(crate) use crate::nested as nested2; } -// @has 'foo/fn.bar10.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar10() -> Bar' +//@ has 'foo/fn.bar10.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar10() -> Bar' pub fn bar10() -> nested::Alias { Alias } -// @has 'foo/fn.bar11.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar11() -> Whatever' +//@ has 'foo/fn.bar11.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar11() -> Whatever' pub fn bar11() -> nested::Whatever3 { Whatever } -// @has 'foo/fn.bar12.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar12() -> Whatever4' +//@ has 'foo/fn.bar12.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar12() -> Whatever4' pub fn bar12() -> nested::Whatever4 { Whatever } -// @has 'foo/fn.bar13.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar13() -> Bar' +//@ has 'foo/fn.bar13.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar13() -> Bar' pub fn bar13() -> nested::nested2::Alias { Alias } -// @has 'foo/fn.bar14.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar14() -> Whatever' +//@ has 'foo/fn.bar14.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar14() -> Whatever' pub fn bar14() -> nested::nested2::Whatever3 { Whatever } -// @has 'foo/fn.bar15.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar15() -> Whatever4' +//@ has 'foo/fn.bar15.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar15() -> Whatever4' pub fn bar15() -> nested::nested2::Whatever4 { Whatever } @@ -119,7 +119,7 @@ use external::Public as Private; pub mod external { pub struct Public; - // @has 'foo/external/fn.make.html' - // @has - '//*[@class="rust item-decl"]/code' 'pub fn make() -> Public' + //@ has 'foo/external/fn.make.html' + //@ has - '//*[@class="rust item-decl"]/code' 'pub fn make() -> Public' pub fn make() -> super::Private { super::Private } } diff --git a/tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs index 1c86c769a12..a0b637f0992 100644 --- a/tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs +++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs @@ -7,8 +7,8 @@ pub mod bar { pub struct Foo<'a, T>(&'a T); } -// @has "foo/fn.foo.html" -// @has - '//*[@class="rust item-decl"]/code' "pub fn foo<'a, T>(f: Foo<'a, T>) -> Foo<'a, usize>" +//@ has "foo/fn.foo.html" +//@ has - '//*[@class="rust item-decl"]/code' "pub fn foo<'a, T>(f: Foo<'a, T>) -> Foo<'a, usize>" pub fn foo<'a, T>(f: Alias<'a, T>) -> Alias<'a, usize> { Alias(&0) } diff --git a/tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs index 7d6fadf26e2..62127daaec8 100644 --- a/tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs +++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs @@ -10,8 +10,8 @@ mod bar { pub struct Bar; } -// @has 'foo/fn.bar.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar() -> Alias' +//@ has 'foo/fn.bar.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar() -> Alias' pub fn bar() -> Alias { Alias } diff --git a/tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs index 6bf507838d5..adf41aa10cb 100644 --- a/tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs +++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs @@ -12,22 +12,22 @@ mod bar { } // It's a fully private re-export so it should not be displayed. -// @has 'foo/fn.bar.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar() -> Bar' +//@ has 'foo/fn.bar.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar() -> Bar' pub fn bar() -> Alias { Alias } // It's public re-export inside a private module so it should be visible. -// @has 'foo/fn.bar2.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar2() -> Inner' +//@ has 'foo/fn.bar2.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar2() -> Inner' pub fn bar2() -> crate::bar::Inner { Alias } // It's a non-public, so it doesn't appear in documentation so it should not be visible. -// @has 'foo/fn.bar3.html' -// @has - '//*[@class="rust item-decl"]/code' 'pub fn bar3() -> Bar' +//@ has 'foo/fn.bar3.html' +//@ has - '//*[@class="rust item-decl"]/code' 'pub fn bar3() -> Bar' pub fn bar3() -> CrateAlias { Alias } diff --git a/tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs b/tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs index cffe1289ce8..6cdfc71b13f 100644 --- a/tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs +++ b/tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs @@ -5,8 +5,8 @@ #![no_core] #![feature(no_core)] -// @matchesraw 'foo/sidebar-items.js' '"repro"' -// @!matchesraw 'foo/sidebar-items.js' '"repro".*"repro"' +//@ matchesraw 'foo/sidebar-items.js' '"repro"' +//@ !matchesraw 'foo/sidebar-items.js' '"repro".*"repro"' #[macro_export] macro_rules! repro { diff --git a/tests/rustdoc/inline_local/trait-vis.rs b/tests/rustdoc/inline_local/trait-vis.rs index 19b69da1513..1e5929a9ccf 100644 --- a/tests/rustdoc/inline_local/trait-vis.rs +++ b/tests/rustdoc/inline_local/trait-vis.rs @@ -12,7 +12,7 @@ mod asdf { impl PrivateTrait for SomeStruct {} } -// @has trait_vis/struct.SomeStruct.html -// @has - '//h3[@class="code-header"]' 'impl ThisTrait for SomeStruct' -// @!has - '//h3[@class="code-header"]' 'impl PrivateTrait for SomeStruct' +//@ has trait_vis/struct.SomeStruct.html +//@ has - '//h3[@class="code-header"]' 'impl ThisTrait for SomeStruct' +//@ !has - '//h3[@class="code-header"]' 'impl PrivateTrait for SomeStruct' pub use asdf::SomeStruct; -- cgit 1.4.1-3-g733a5