Skip to content

Commit b34e240

Browse files
camelidcamelid
committed
Update @!has name in tests
1 parent 9db6061 commit b34e240

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+127
-127
lines changed

‎src/test/rustdoc/all.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ mod private_module {
2424
}
2525

2626
// @has foo/all.html '//a[@href="struct.ReexportedStruct.html"]' 'ReexportedStruct'
27-
// @!has foo/all.html 'private_module'
27+
// @!hasraw foo/all.html 'private_module'
2828
pub use private_module::ReexportedStruct;

‎src/test/rustdoc/assoc-consts.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub trait Foo {
55
const FOO: usize = 12 + 1;
66
// @has - '//*[@id="associatedconstant.FOO_NO_DEFAULT"]' 'const FOO_NO_DEFAULT: bool'
77
const FOO_NO_DEFAULT: bool;
8-
// @!has - FOO_HIDDEN
8+
// @!hasraw - FOO_HIDDEN
99
#[doc(hidden)]
1010
const FOO_HIDDEN: u8 = 0;
1111
}
@@ -18,7 +18,7 @@ impl Foo for Bar {
1818
const FOO: usize = 12;
1919
// @has - '//*[@id="associatedconstant.FOO_NO_DEFAULT"]' 'const FOO_NO_DEFAULT: bool'
2020
const FOO_NO_DEFAULT: bool = false;
21-
// @!has - FOO_HIDDEN
21+
// @!hasraw - FOO_HIDDEN
2222
#[doc(hidden)]
2323
const FOO_HIDDEN: u8 = 0;
2424
}
@@ -50,9 +50,9 @@ impl Bar {
5050
}
5151

5252
impl Bar {
53-
// @!has assoc_consts/struct.Bar.html 'BAR_PRIVATE'
53+
// @!hasraw assoc_consts/struct.Bar.html 'BAR_PRIVATE'
5454
const BAR_PRIVATE: char = 'a';
55-
// @!has assoc_consts/struct.Bar.html 'BAR_HIDDEN'
55+
// @!hasraw assoc_consts/struct.Bar.html 'BAR_HIDDEN'
5656
#[doc(hidden)]
5757
pub const BAR_HIDDEN: &'static str = "a";
5858
}

‎src/test/rustdoc/const-display.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub const fn foo() -> u32 { 42 }
2020
pub const unsafe fn foo_unsafe() -> u32 { 42 }
2121

2222
// @has 'foo/fn.foo2.html' '//pre' 'pub const fn foo2() -> u32'
23-
// @!has - '//span[@class="since"]'
23+
// @!hasraw - '//span[@class="since"]'
2424
#[unstable(feature = "humans", issue = "none")]
2525
pub const fn foo2() -> u32 { 42 }
2626

@@ -32,7 +32,7 @@ pub const fn bar2() -> u32 { 42 }
3232

3333

3434
// @has 'foo/fn.foo2_gated.html' '//pre' 'pub const unsafe fn foo2_gated() -> u32'
35-
// @!has - '//span[@class="since"]'
35+
// @!hasraw - '//span[@class="since"]'
3636
#[unstable(feature = "foo2", issue = "none")]
3737
pub const unsafe fn foo2_gated() -> u32 { 42 }
3838

@@ -43,7 +43,7 @@ pub const unsafe fn foo2_gated() -> u32 { 42 }
4343
pub const unsafe fn bar2_gated() -> u32 { 42 }
4444

4545
// @has 'foo/fn.bar_not_gated.html' '//pre' 'pub const unsafe fn bar_not_gated() -> u32'
46-
// @!has - '//span[@class="since"]'
46+
// @!hasraw - '//span[@class="since"]'
4747
pub const unsafe fn bar_not_gated() -> u32 { 42 }
4848

4949
pub struct Foo;

‎src/test/rustdoc/deprecated-impls.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl Bar for Foo1 {
7575

7676
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.7: fn_def_def_with_doc'
7777
// @hasraw - 'fn_def_def_with_doc short'
78-
// @!has - 'fn_def_def_with_doc full'
78+
// @!hasraw - 'fn_def_def_with_doc full'
7979

8080
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.8: fn_def_def_without_doc'
8181
}
@@ -86,7 +86,7 @@ pub struct Foo2;
8686
impl Bar for Foo2 {
8787
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.3: fn_empty_with_doc'
8888
// @hasraw - 'fn_empty_with_doc short'
89-
// @!has - 'fn_empty_with_doc full'
89+
// @!hasraw - 'fn_empty_with_doc full'
9090
fn fn_empty_with_doc() {}
9191

9292
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.4: fn_empty_without_doc'
@@ -99,7 +99,7 @@ impl Bar for Foo2 {
9999

100100
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.5: fn_def_with_doc'
101101
// @hasraw - 'fn_def_with_doc short'
102-
// @!has - 'fn_def_with_doc full'
102+
// @!hasraw - 'fn_def_with_doc full'
103103
fn fn_def_with_doc() {}
104104

105105
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.6: fn_def_without_doc'
@@ -112,7 +112,7 @@ impl Bar for Foo2 {
112112

113113
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.7: fn_def_def_with_doc'
114114
// @hasraw - 'fn_def_def_with_doc short'
115-
// @!has - 'fn_def_def_with_doc full'
115+
// @!hasraw - 'fn_def_def_with_doc full'
116116

117117
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.0.8: fn_def_def_without_doc'
118118
}

‎src/test/rustdoc/empty-section.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pub struct Foo;
66

77
// @has foo/struct.Foo.html
8-
// @!has - 'Auto Trait Implementations'
8+
// @!hasraw - 'Auto Trait Implementations'
99
impl !Send for Foo {}
1010
impl !Sync for Foo {}
1111
impl !std::marker::Unpin for Foo {}

‎src/test/rustdoc/hidden-impls.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub mod __hidden {
1111
}
1212

1313
// @has foo/trait.Clone.html
14-
// @!has - 'Foo'
14+
// @!hasraw - 'Foo'
1515
// @has implementors/core/clone/trait.Clone.js
16-
// @!has - 'Foo'
16+
// @!hasraw - 'Foo'
1717
pub use std::clone::Clone;

‎src/test/rustdoc/hidden-line.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
/// ```
1616
pub fn foo() {}
1717

18-
// @!has hidden_line/fn.foo.html invisible
18+
// @!hasraw hidden_line/fn.foo.html invisible
1919
// @matches - //pre "#\[derive\(PartialEq\)\] // Bar"

‎src/test/rustdoc/hidden-methods.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ pub mod hidden {
1717
}
1818

1919
// @has foo/struct.Foo.html
20-
// @!has - 'Methods'
20+
// @!hasraw - 'Methods'
2121
// @!has - '//code' 'impl Foo'
22-
// @!has - 'this_should_be_hidden'
22+
// @!hasraw - 'this_should_be_hidden'
2323
pub use hidden::Foo;
2424

2525
// @has foo/struct.Bar.html
26-
// @!has - 'Methods'
26+
// @!hasraw - 'Methods'
2727
// @!has - '//code' 'impl Bar'
28-
// @!has - 'this_should_be_hidden'
28+
// @!hasraw - 'this_should_be_hidden'
2929
pub use hidden::Bar;

‎src/test/rustdoc/inline_cross/assoc-items.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
extern crate assoc_items;
88

99
// @has foo/struct.MyStruct.html
10-
// @!has - 'PrivateConst'
10+
// @!hasraw - 'PrivateConst'
1111
// @has - '//*[@id="associatedconstant.PublicConst"]' 'pub const PublicConst: u8'
1212
// @has - '//*[@class="docblock"]' 'docs for PublicConst'
13-
// @!has - 'private_method'
13+
// @!hasraw - 'private_method'
1414
// @has - '//*[@id="method.public_method"]' 'pub fn public_method()'
1515
// @has - '//*[@class="docblock"]' 'docs for public_method'
1616
// @has - '//*[@id="associatedconstant.ConstNoDefault"]' 'const ConstNoDefault: i16'

‎src/test/rustdoc/inline_cross/hidden-use.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
extern crate rustdoc_hidden;
66

77
// @has hidden_use/index.html
8-
// @!has - 'rustdoc_hidden'
9-
// @!has - 'Bar'
8+
// @!hasraw - 'rustdoc_hidden'
9+
// @!hasraw - 'Bar'
1010
// @!has hidden_use/struct.Bar.html
1111
#[doc(hidden)]
1212
pub use rustdoc_hidden::Bar;

‎src/test/rustdoc/inline_local/glob-extern-document-private-items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub use mod1::*;
1414
// @has foo/index.html
1515
// @hasraw - "mod1"
1616
// @hasraw - "public_fn"
17-
// @!has - "private_fn"
17+
// @!hasraw - "private_fn"
1818
// @has foo/fn.public_fn.html
1919
// @!has foo/fn.private_fn.html
2020

‎src/test/rustdoc/inline_local/glob-extern.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ mod mod1 {
1010
pub use mod1::*;
1111

1212
// @has foo/index.html
13-
// @!has - "mod1"
13+
// @!hasraw - "mod1"
1414
// @hasraw - "public_fn"
15-
// @!has - "private_fn"
15+
// @!hasraw - "private_fn"
1616
// @has foo/fn.public_fn.html
1717
// @!has foo/fn.private_fn.html
1818

‎src/test/rustdoc/inline_local/glob-private-document-private-items.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ pub use mod1::*;
1717
// @has foo/index.html
1818
// @hasraw - "mod1"
1919
// @hasraw - "Mod1Public"
20-
// @!has - "Mod1Private"
21-
// @!has - "mod2"
20+
// @!hasraw - "Mod1Private"
21+
// @!hasraw - "mod2"
2222
// @hasraw - "Mod2Public"
23-
// @!has - "Mod2Private"
23+
// @!hasraw - "Mod2Private"
2424
// @has foo/struct.Mod1Public.html
2525
// @!has foo/struct.Mod1Private.html
2626
// @has foo/struct.Mod2Public.html
@@ -30,8 +30,8 @@ pub use mod1::*;
3030
// @hasraw - "mod2"
3131
// @hasraw - "Mod1Public"
3232
// @hasraw - "Mod1Private"
33-
// @!has - "Mod2Public"
34-
// @!has - "Mod2Private"
33+
// @!hasraw - "Mod2Public"
34+
// @!hasraw - "Mod2Private"
3535
// @has foo/mod1/struct.Mod1Public.html
3636
// @has foo/mod1/struct.Mod1Private.html
3737
// @!has foo/mod1/struct.Mod2Public.html

‎src/test/rustdoc/inline_local/glob-private.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ mod mod1 {
1313
pub use mod1::*;
1414

1515
// @has foo/index.html
16-
// @!has - "mod1"
16+
// @!hasraw - "mod1"
1717
// @hasraw - "Mod1Public"
18-
// @!has - "Mod1Private"
19-
// @!has - "mod2"
18+
// @!hasraw - "Mod1Private"
19+
// @!hasraw - "mod2"
2020
// @hasraw - "Mod2Public"
21-
// @!has - "Mod2Private"
21+
// @!hasraw - "Mod2Private"
2222
// @has foo/struct.Mod1Public.html
2323
// @!has foo/struct.Mod1Private.html
2424
// @has foo/struct.Mod2Public.html

‎src/test/rustdoc/inline_local/hidden-use.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ mod private {
33
}
44

55
// @has hidden_use/index.html
6-
// @!has - 'private'
7-
// @!has - 'Foo'
6+
// @!hasraw - 'private'
7+
// @!hasraw - 'Foo'
88
// @!has hidden_use/struct.Foo.html
99
#[doc(hidden)]
1010
pub use private::Foo;

‎src/test/rustdoc/inline_local/macro_by_example.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ macro_rules! foo {
77

88
// @has macro_by_example/macros/index.html
99
pub mod macros {
10-
// @!has - 'pub use foo as bar;'
10+
// @!hasraw - 'pub use foo as bar;'
1111
// @has macro_by_example/macros/macro.bar.html
1212
// @has - '//*[@class="docblock"]' 'docs for foo'
1313
// @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.2.3: text'

‎src/test/rustdoc/inline_local/please_inline.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub mod foo {
44

55
// @has please_inline/a/index.html
66
pub mod a {
7-
// @!has - 'pub use foo::'
7+
// @!hasraw - 'pub use foo::'
88
// @has please_inline/a/struct.Foo.html
99
#[doc(inline)]
1010
pub use foo::Foo;

‎src/test/rustdoc/internal.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
// Check that the unstable marker is not added for "rustc_private".
44

5-
// @!matches internal/index.html \
5+
// @!matchesraw internal/index.html \
66
// '//*[@class="item-right docblock-short"]/span[@class="stab unstable"]'
7-
// @!matches internal/index.html \
7+
// @!matchesraw internal/index.html \
88
// '//*[@class="item-right docblock-short"]/span[@class="stab internal"]'
99
// @matches - '//*[@class="item-right docblock-short"]' 'Docs'
1010

11-
// @!has internal/struct.S.html '//*[@class="stab unstable"]'
12-
// @!has internal/struct.S.html '//*[@class="stab internal"]'
11+
// @!hasraw internal/struct.S.html '//*[@class="stab unstable"]'
12+
// @!hasraw internal/struct.S.html '//*[@class="stab internal"]'
1313
/// Docs
1414
pub struct S;
1515

‎src/test/rustdoc/issue-23812.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ doc! {
1717

1818
// @has issue_23812/Foo/index.html
1919
// @hasraw - 'Outer comment'
20-
// @!has - '/// Outer comment'
20+
// @!hasraw - '/// Outer comment'
2121
// @hasraw - 'Inner comment'
22-
// @!has - '//! Inner comment'
22+
// @!hasraw - '//! Inner comment'
2323

2424

2525
doc! {
@@ -31,6 +31,6 @@ doc! {
3131

3232
// @has issue_23812/Bar/index.html
3333
// @hasraw - 'Outer block comment'
34-
// @!has - '/** Outer block comment */'
34+
// @!hasraw - '/** Outer block comment */'
3535
// @hasraw - 'Inner block comment'
36-
// @!has - '/*! Inner block comment */'
36+
// @!hasraw - '/*! Inner block comment */'

‎src/test/rustdoc/issue-27104.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// ignore-cross-compile
44

55
// @has issue_27104/index.html
6-
// @!has - 'extern crate std'
7-
// @!has - 'use std::prelude::'
6+
// @!hasraw - 'extern crate std'
7+
// @!hasraw - 'use std::prelude::'
88

99
// @hasraw - 'pub extern crate empty'
1010
pub extern crate empty;

‎src/test/rustdoc/issue-29584.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
extern crate issue_29584;
55

66
// @has issue_29584/struct.Foo.html
7-
// @!has - 'impl Bar for'
7+
// @!hasraw - 'impl Bar for'
88
pub use issue_29584::Foo;

‎src/test/rustdoc/issue-31899.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// @has issue_31899/index.html
22
// @hasraw - 'Make this line a bit longer.'
3-
// @!has - 'rust rust-example-rendered'
4-
// @!has - 'use ndarray::arr2'
5-
// @!has - 'prohibited'
3+
// @!hasraw - 'rust rust-example-rendered'
4+
// @!hasraw - 'use ndarray::arr2'
5+
// @!hasraw - 'prohibited'
66

77
/// A tuple or fixed size array that can be used to index an array.
88
/// Make this line a bit longer.

‎src/test/rustdoc/issue-32395.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// ignore-cross-compile
44

55
// @has variant_struct/enum.Foo.html
6-
// @!has - 'pub qux'
7-
// @!has - 'pub(crate) qux'
8-
// @!has - 'pub Bar'
6+
// @!hasraw - 'pub qux'
7+
// @!hasraw - 'pub(crate) qux'
8+
// @!hasraw - 'pub Bar'
99
extern crate variant_struct;
1010

1111
// @has issue_32395/enum.Foo.html
12-
// @!has - 'pub qux'
13-
// @!has - 'pub(crate) qux'
14-
// @!has - 'pub Bar'
12+
// @!hasraw - 'pub qux'
13+
// @!hasraw - 'pub(crate) qux'
14+
// @!hasraw - 'pub Bar'
1515
pub use variant_struct::Foo;

‎src/test/rustdoc/issue-34473.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mod second {
55
}
66

77
// @has foo/index.html
8-
// @!has - SomeTypeWithLongName
8+
// @!hasraw - SomeTypeWithLongName
99
// @has foo/struct.SomeType.html
1010
// @!has foo/struct.SomeTypeWithLongName.html
1111
pub use second::{SomeTypeWithLongName as SomeType};

‎src/test/rustdoc/issue-41783.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @has issue_41783/struct.Foo.html
2-
// @!has - 'space'
3-
// @!has - 'comment'
2+
// @!hasraw - 'space'
3+
// @!hasraw - 'comment'
44
// @hasraw - '# <span class="ident">single'
55
// @hasraw - '## <span class="ident">double</span>'
66
// @hasraw - '### <span class="ident">triple</span>'

‎src/test/rustdoc/issue-53689.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
extern crate issue_53689;
66

77
// @has foo/trait.MyTrait.html
8-
// @!has - 'MyStruct'
8+
// @!hasraw - 'MyStruct'
99
// @count - '//*[h3="impl<T> MyTrait for T"]' 1
1010
pub trait MyTrait {}
1111

‎src/test/rustdoc/issue-61592.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ extern crate foo;
55
// @has issue_61592/index.html
66
// @has - '//a[@href="#reexports"]' 'Re-exports'
77
// @has - '//code' 'pub use foo::FooTrait as _;'
8-
// @!has - '//a[@href="trait._.html"]'
8+
// @!hasraw - '//a[@href="trait._.html"]'
99
pub use foo::FooTrait as _;
1010

1111
// @has issue_61592/index.html
1212
// @has - '//a[@href="#reexports"]' 'Re-exports'
1313
// @has - '//code' 'pub use foo::FooStruct as _;'
14-
// @!has - '//a[@href="struct._.html"]'
14+
// @!hasraw - '//a[@href="struct._.html"]'
1515
pub use foo::FooStruct as _;

‎src/test/rustdoc/issue-89852.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#![feature(no_core)]
55

66
// @matchesraw 'issue_89852/sidebar-items.js' '"repro"'
7-
// @!matches 'issue_89852/sidebar-items.js' '"repro".*"repro"'
7+
// @!matchesraw 'issue_89852/sidebar-items.js' '"repro".*"repro"'
88

99
#[macro_export]
1010
macro_rules! repro {

0 commit comments

Comments
 (0)