Commit ae9f012
authored
Rollup merge of rust-lang#54824 - Munksgaard:fix-49713, r=QuietMisdreavus
Cleanup rustdoc tests with `@!has` and `@!matches`
Fixes rust-lang#49713
Here's a _long_ list of all the places that include `@!has`. I have marked the ones I have looked at so far.
- [x] search-index.rs: fn priv_method() {} // @!has - priv_method
- [x] search-index.rs: fn trait_method(&self) {} // @!has - priv_method
- [x] search-index.rs: // @!has search-index.js Target
- [x] short-dockblock.rs:// @!has foo/index.html '//*[@Class="docblock-short"]/p/h1' 'fooo'
- [x] short-dockblock.rs:// @!has foo/index.html '//*[@Class="docblock-short"]/p/h2' 'mooood'
- [x] keyword.rs:// @!has foo/index.html '//a/@href' 'foo/index.html'
- [x] keyword.rs:// @!has foo/foo/index.html
- [x] keyword.rs:// @!has-dir foo/foo
- [x] issue-46380-2.rs:// @!has - '//*[@Class="impl"]' 'impl PublicTrait<PrivateStruct> for PublicStruct'
- [x] escape-rust-expr.rs:// @!has escape_rust_expr/constant.CONST_S.html '//pre[@Class="rust const"]' '"<script>"'
- [x] issue-33069.rs:// @!has - '//code' 'impl Bar for Foo'
- [x] playground-empty.rs:// @!has foo/index.html '//a[@Class="test-arrow"]' "Run"
- [x] issue-34473.rs:// @!has - SomeTypeWithLongName
- [x] issue-34473.rs:// @!has - SomeTypeWithLongName
- [x] issue-34473.rs:// @!has foo/struct.SomeTypeWithLongName.html
- [x] issue-29584.rs:// @!has - 'impl Bar for'
- [x] hidden-line.rs:// @!has hidden_line/fn.foo.html invisible
- [x] manual_impl.rs:// @!has - '//*[@Class="docblock"]' 'Docs associated with the trait a_method definition.'
- [x] manual_impl.rs:// @!has - '//*[@Class="docblock"]' 'There is another line'
- [x] manual_impl.rs:// @!has - '//*[@Class="docblock"]' 'Docs associated with the trait a_method definition.'
- [x] manual_impl.rs:// @!has - '//*[@Class="docblock"]' 'Docs associated with the trait c_method definition.'
- [x] issue-19190-2.rs:// @!has - '//*[@id="method.new"]' 'fn new() -> String'
- [x] unneeded-trait-implementations-title.rs:// @!has foo/struct.Bar.html '//*[@id="implementations"]'
- [x] masked.rs:// @!has 'search-index.js' 'masked_method'
- [x] masked.rs:// @!has 'foo/struct.String.html' 'MaskedTrait'
- [x] masked.rs:// @!has 'foo/struct.String.html' 'masked_method'
- [x] masked.rs:// @!has 'foo/trait.Clone.html' 'MaskedStruct'
- [x] masked.rs:// @!has 'foo/struct.MyStruct.html' 'MaskedTrait'
- [x] masked.rs:// @!has 'foo/struct.MyStruct.html' 'masked_method'
- [x] masked.rs:// @!has 'foo/trait.MyTrait.html' 'MaskedStruct'
- [x] redirect.rs:// @!has - '//code/a' 'Qux'
- [x] issue-43701.rs:// @!has implementors/core/clone/trait.Clone.js
- [x] union.rs: // @!has - //pre "b: u16"
- [x] prim-title.rs:// @!has - '//head/title' 'foo'
- [x] empty-section.rs:// @!has - '//*[@Class="synthetic-implementations"]' 'Auto Trait Implementations'
- [x] traits-in-bodies-private.rs:// @!has - '//code' 'impl HiddenTrait for SomeStruct'
- [x] playground-none.rs:// @!has foo/index.html '//a[@Class="test-arrow"]' "Run"
- [x] issue-34025.rs:// @!has 'foo/sys/index.html'
- [x] issue-34025.rs:// @!has 'foo/sys/sidebar-items.js'
- [x] issue-34025.rs: // @!has 'foo/sys/fn.foo.html'
- [x] issue-23812.rs:// @!has - '/// Outer comment'
- [x] issue-23812.rs:// @!has - '//! Inner comment'
- [x] issue-23812.rs:// @!has - '/** Outer block comment */'
- [x] issue-23812.rs:// @!has - '/*! Inner block comment */'
- [x] pub-use-extern-macros.rs:// @!has pub_use_extern_macros/index.html '//code' 'pub use macros::bar;'
- [x] pub-use-extern-macros.rs:// @!has pub_use_extern_macros/index.html '//code' 'pub use macros::baz;'
- [x] pub-use-extern-macros.rs:// @!has pub_use_extern_macros/macro.quux.html
- [x] pub-use-extern-macros.rs:// @!has pub_use_extern_macros/index.html '//code' 'pub use macros::quux;'
- [x] issue-26606.rs:// @!has - '//a/@href' '../src/'
- [x] foreigntype-reexport.rs:// @!has foreigntype_reexport/foreigntype.X4.html
- [x] foreigntype-reexport.rs:// @!has foreigntype_reexport/index.html '//a[@Class="foreigntype"]' 'X4'
- [x] issue-31899.rs:// @!has - 'rust rust-example-rendered'
- [x] issue-31899.rs:// @!has - 'use ndarray::arr2'
- [x] issue-31899.rs:// @!has - 'prohibited'
- [x] hidden-trait-struct-impls.rs:// @!has foo/struct.Bar.html '//*[@id="impl-Foo"]' 'impl Foo for Bar'
- [x] hidden-trait-struct-impls.rs:// @!has foo/struct.Bar.html '//*[@id="impl-Dark"]' 'impl Dark for Bar'
- [x] hidden-trait-struct-impls.rs:// @!has foo/trait.Bam.html '//*[@id="implementors-list"]' 'impl Bam for Hidden'
- [x] hidden-impls.rs:// @!has - 'Foo'
- [x] hidden-impls.rs:// @!has - 'Foo'
- [x] module-impls.rs:// @!has foo/index.html 'Implementations'
- [x] issue-35169.rs:// @!has - '//*[@id="by_mut_ref.v"]' 'fn by_mut_ref(&mut self)'
- [x] issue-35169.rs:// @!has - '//*[@id="method.by_mut_ref"]' 'fn by_mut_ref(&mut self)'
- [x] issue-35169.rs:// @!has - '//*[@id="by_explicit_mut_ref.v"]' 'fn by_explicit_mut_ref(self: &mut Foo)'
- [x] issue-35169.rs:// @!has - '//*[@id="method.by_explicit_mut_ref"]' 'fn by_explicit_mut_ref(self: &mut Foo)'
- [x] issue-35169.rs:// @!has - '//*[@id="by_explicit_box.v"]' 'fn by_explicit_box(self: Box<Foo>)'
- [x] issue-35169.rs:// @!has - '//*[@id="method.by_explicit_box"]' 'fn by_explicit_box(self: Box<Foo>)'
- [x] issue-35169.rs:// @!has - '//*[@id="by_explicit_self_box.v"]' 'fn by_explicit_self_box(self: Box<Self>)'
- [x] issue-35169.rs:// @!has - '//*[@id="method.by_explicit_self_box"]' 'fn by_explicit_self_box(self: Box<Self>)'
- [x] issue-35169.rs:// @!has - '//*[@id="static_foo.v"]' 'fn static_foo()'
- [x] issue-35169.rs:// @!has - '//*[@id="method.static_foo"]' 'fn static_foo()'
- [x] extern-links.rs:// @!has foo/index.html '//a' 'extern_links'
- [x] extern-links.rs:// @!has foo/index.html '//a' 'Foo'
- [x] extern-links.rs: // @!has foo/hidden/extern_links/index.html
- [x] extern-links.rs: // @!has foo/hidden/extern_links/struct.Foo.html
- [x] issue-33178-1.rs:// @!has - //a/@title empty
- [x] issue-33178-1.rs:// @!has - //a/@title variant_struct
- [x] issue-47038.rs:// @!has - '//*[@id="macros"]' 'Macros'
- [x] issue-47038.rs:// @!has - '//a/@href' 'macro.vec.html'
- [x] issue-47038.rs:// @!has 'foo/macro.vec.html'
- [x] issue-46766.rs:// @!has foo/index.html '//a/@href' './Enum/index.html'
- [x] issue-32395.rs:// @!has - 'pub qux'
- [x] issue-32395.rs:// @!has - 'pub Bar'
- [x] issue-32395.rs:// @!has - 'pub qux'
- [x] issue-32395.rs:// @!has - 'pub Bar'
- [x] hidden-methods.rs:// @!has - 'Methods'
- [x] hidden-methods.rs:// @!has - 'impl Foo'
- [x] hidden-methods.rs:// @!has - 'this_should_be_hidden'
- [x] hidden-methods.rs:// @!has - 'Methods'
- [x] hidden-methods.rs:// @!has - 'impl Bar'
- [x] hidden-methods.rs:// @!has - 'this_should_be_hidden'
- [x] structfields.rs: // @!has - //pre "b: ()"
- [x] structfields.rs: // @!has - //pre "c: usize"
- [x] structfields.rs: // @!has - //pre "// some fields omitted"
- [x] structfields.rs: // @!has - //pre "b: ()"
- [x] issue-46767.rs:// @!has foo/index.html '//a/@href' './private/index.html'
- [x] assoc-consts.rs: // @!has - FOO_HIDDEN
- [x] assoc-consts.rs: // @!has - FOO_HIDDEN
- [x] assoc-consts.rs: // @!has assoc_consts/struct.Bar.html 'BAR_PRIVATE'
- [x] assoc-consts.rs: // @!has assoc_consts/struct.Bar.html 'BAR_HIDDEN'
- [x] issue-53689.rs:// @!has - 'MyStruct'
- [x] search-index-summaries.rs:// @!has - 'www.example.com'
- [x] search-index-summaries.rs:// @!has - 'More Foo.'
- [x] impl-everywhere.rs:// @!has foo/fn.foo.html '//section[@id="main"]//pre' "x: &\'x impl Foo"
- [x] impl-everywhere.rs:// @!has foo/fn.foo.html '//section[@id="main"]//pre' "-> &\'x impl Foo {"
- [x] impl-everywhere.rs:// @!has foo/fn.foo2.html '//section[@id="main"]//pre' "x: &\'x impl Foo"
- [x] impl-everywhere.rs:// @!has foo/fn.foo2.html '//section[@id="main"]//pre' '-> impl Foo2 {'
- [x] impl-everywhere.rs:// @!has foo/fn.foo_foo.html '//section[@id="main"]//pre' '-> impl Foo + Foo2 {'
- [x] impl-everywhere.rs:// @!has foo/fn.foo2.html '//section[@id="main"]//pre' "x: &'x (impl Foo + Foo2)"
- [x] issue-19190.rs:// @!has - '//*[@id="static_foo.v"]' 'fn static_foo()'
- [x] issue-19190.rs:// @!has - '//*[@id="method.static_foo"]' 'fn static_foo()'
- [x] deprecated-impls.rs: // @!has - 'fn_def_def_with_doc full'
- [x] deprecated-impls.rs: // @!has - 'fn_empty_with_doc full'
- [x] deprecated-impls.rs: // @!has - 'fn_def_with full'
- [x] deprecated-impls.rs: // @!has - 'fn_def_def_with_doc full'
- [x] issue-19190-3.rs:// @!has - '//*[@id="method.new"]' 'fn new() -> String'
- [x] issue-19190-3.rs:// @!has - '//*[@id="method.static_baz"]' 'fn static_baz()'
- [x] issue-19190-3.rs:// @!has - '//*[@id="method.static_baz"]' 'fn static_baz()'
- [x] sidebar-items.rs:// @!has - '//*[@Class="sidebar-links"]/a' 'waza'
- [x] sidebar-items.rs:// @!has - '//*[@Class="sidebar-links"]/a' 'waza'
- [x] issue-27104.rs:// @!has - 'extern crate std'
- [x] issue-27104.rs:// @!has - 'use std::prelude::'
- [x] issue-13698.rs:// @!has issue_13698/struct.Foo.html '//*[@id="method.foo"]' 'fn foo'
- [x] issue-13698.rs:// @!has issue_13698/struct.Foo.html '//*[@id="method.foo"]' 'fn bar'
- [x] issue-41783.rs:// @!has - 'space'
- [x] issue-41783.rs:// @!has - 'comment'
- [x] trait-self-link.rs:// @!has trait_self_link/trait.Foo.html //a/@href ../trait_self_link/trait.Foo.html
- [x] generic-impl.rs:// @!has foo/struct.Bar.html '//h3[@id="impl-ToString"]//code' 'impl<T> ToString for T'
- [x] all.rs:// @!has foo/all.html 'private_module'
- [x] issue-35169-2.rs:// @!has - '//*[@id="by_explicit_box.v"]' 'fn by_explicit_box(self: Box<Foo>)'
- [x] issue-35169-2.rs:// @!has - '//*[@id="method.by_explicit_box"]' 'fn by_explicit_box(self: Box<Foo>)'
- [x] issue-35169-2.rs:// @!has - '//*[@id="by_explicit_self_box.v"]' 'fn by_explicit_self_box(self: Box<Self>)'
- [x] issue-35169-2.rs:// @!has - '//*[@id="method.by_explicit_self_box"]' 'fn by_explicit_self_box(self: Box<Self>)'
- [x] issue-35169-2.rs:// @!has - '//*[@id="static_foo.v"]' 'fn static_foo()'
- [x] issue-35169-2.rs:// @!has - '//*[@id="method.static_foo"]' 'fn static_foo()'
- [x] doc-cfg.rs:// @!has - '//*[@id="main"]/*[@Class="stability"]/*[@Class="stab portability"]' ''
- [x] inline_local/glob-private.rs:// @!has - "mod1"
- [x] inline_local/glob-private.rs:// @!has - "Mod1Private"
- [x] inline_local/glob-private.rs:// @!has - "mod2"
- [x] inline_local/glob-private.rs:// @!has - "Mod2Private"
- [x] inline_local/glob-private.rs:// @!has foo/struct.Mod1Private.html
- [x] inline_local/glob-private.rs:// @!has foo/struct.Mod2Private.html
- [x] inline_local/glob-private.rs:// @!has foo/mod1/index.html
- [x] inline_local/glob-private.rs:// @!has foo/mod1/struct.Mod1Private.html
- [x] inline_local/glob-private.rs:// @!has foo/mod1/struct.Mod2Public.html
- [x] inline_local/glob-private.rs:// @!has foo/mod1/struct.Mod2Private.html
- [x] inline_local/glob-private.rs:// @!has foo/mod1/mod2/index.html
- [x] inline_local/glob-private.rs:// @!has foo/mod1/mod2/struct.Mod2Private.html
- [x] inline_local/glob-private.rs:// @!has-dir foo/mod2
- [x] inline_local/glob-private.rs:// @!has foo/mod2/index.html
- [x] inline_local/glob-private.rs:// @!has foo/mod2/struct.Mod2Public.html
- [x] inline_local/glob-private.rs:// @!has foo/mod2/struct.Mod2Private.html
- [x] inline_local/hidden-use.rs:// @!has - 'private'
- [x] inline_local/hidden-use.rs:// @!has - 'Foo'
- [x] inline_local/hidden-use.rs:// @!has hidden_use/struct.Foo.html
- [x] inline_local/glob-extern-no-defaults.rs:// @!has - "private_fn"
- [x] inline_local/glob-extern-no-defaults.rs:// @!has foo/fn.private_fn.html
- [x] inline_local/issue-32343.rs:// @!has issue_32343/struct.Foo.html
- [x] inline_local/issue-32343.rs:// @!has - '//code/a' 'Foo'
- [x] inline_local/issue-32343.rs:// @!has issue_32343/struct.Bar.html
- [x] inline_local/glob-private-no-defaults.rs:// @!has - "Mod1Private"
- [x] inline_local/glob-private-no-defaults.rs:// @!has - "mod2"
- [x] inline_local/glob-private-no-defaults.rs:// @!has - "Mod2Private"
- [x] inline_local/glob-private-no-defaults.rs:// @!has foo/struct.Mod1Private.html
- [x] inline_local/glob-private-no-defaults.rs:// @!has foo/struct.Mod2Private.html
- [x] inline_local/glob-private-no-defaults.rs:// @!has - "Mod2Public"
- [x] inline_local/glob-private-no-defaults.rs:// @!has - "Mod2Private"
- [x] inline_local/glob-private-no-defaults.rs:// @!has foo/mod1/struct.Mod2Public.html
- [x] inline_local/glob-private-no-defaults.rs:// @!has foo/mod1/struct.Mod2Private.html
- [x] inline_local/glob-private-no-defaults.rs:// @!has foo/mod2/index.html
- [x] inline_local/glob-private-no-defaults.rs:// @!has foo/mod2/struct.Mod2Public.html
- [x] inline_local/glob-private-no-defaults.rs:// @!has foo/mod2/struct.Mod2Private.html
- [x] inline_local/glob-extern.rs:// @!has - "mod1"
- [x] inline_local/glob-extern.rs:// @!has - "private_fn"
- [x] inline_local/glob-extern.rs:// @!has foo/fn.private_fn.html
- [x] inline_local/glob-extern.rs:// @!has foo/mod1/index.html
- [x] inline_local/glob-extern.rs:// @!has foo/mod1/fn.private_fn.html
- [x] inline_local/please_inline.rs: // @!has - 'pub use foo::'
- [x] inline_local/please_inline.rs: // @!has please_inline/b/struct.Foo.html
- [x] inline_cross/hidden-use.rs:// @!has - 'rustdoc_hidden'
- [x] inline_cross/hidden-use.rs:// @!has - 'Bar'
- [x] inline_cross/hidden-use.rs:// @!has hidden_use/struct.Bar.html
- [x] inline_cross/inline_hidden.rs:// @!has - '//a/@title' 'Foo'
- [x] inline_cross/assoc-items.rs:// @!has - 'PrivateConst'
- [x] inline_cross/assoc-items.rs:// @!has - 'private_method'
- [x] inline_cross/cross-glob.rs:// @!has cross_glob/index.html '//code' 'pub use inner::*;'
- [x] inline_cross/macro-vis.rs:// @!has - '//pre' 'some_macro'
- [x] inline_cross/macro-vis.rs:// @!has macro_vis/macro.other_macro.html
- [x] inline_cross/macro-vis.rs:// @!has macro_vis/index.html '//a/@href' 'macro.other_macro.html'
- [x] inline_cross/macro-vis.rs:// @!has - '//code' 'pub use qwop::other_macro;'
- [x] inline_cross/macro-vis.rs:// @!has macro_vis/macro.super_macro.html
- [x] inline_cross/issue-31948.rs:// @!has - '//*[@Class="impl"]//code' 'Bar for'
- [x] inline_cross/issue-31948.rs:// @!has - '//*[@Class="impl"]//code' 'Qux for'
- [x] inline_cross/issue-31948.rs:// @!has - '//code' 'for Wibble'
- [x] inline_cross/issue-31948.rs:// @!has - '//code' 'for Wobble'
- [x] inline_cross/issue-31948.rs:// @!has - '//code' 'for Wibble'
- [x] inline_cross/issue-31948.rs:// @!has - '//code' 'for Wobble'
- [x] inline_cross/issue-31948.rs:// @!has issue_31948/trait.Bar.html
- [x] inline_cross/issue-31948.rs:// @!has issue_31948/trait.Qux.html
- [x] inline_cross/issue-31948.rs:// @!has issue_31948/struct.Wibble.html
- [x] inline_cross/issue-31948.rs:// @!has issue_31948/struct.Wobble.html
- [x] inline_cross/issue-31948-1.rs:// @!has - '//*[@Class="impl"]//code' 'Bar for'
- [x] inline_cross/issue-31948-1.rs:// @!has - '//*[@Class="impl"]//code' 'Qux for'
- [x] inline_cross/issue-31948-1.rs:// @!has - '//code' 'for Wibble'
- [x] inline_cross/issue-31948-1.rs:// @!has - '//code' 'for Wibble'
- [x] inline_cross/issue-31948-1.rs:// @!has issue_31948_1/trait.Bar.html
- [x] inline_cross/issue-31948-1.rs:// @!has issue_31948_1/trait.Qux.html
- [x] inline_cross/issue-28480.rs:// @!has - '//a/@title' 'Hidden'
- [x] inline_cross/issue-28480.rs:// @!has - '//a/@title' 'Hidden'
- [x] inline_cross/issue-31948-2.rs:// @!has - '//*[@Class="impl"]//code' 'Bar for'
- [x] inline_cross/issue-31948-2.rs:// @!has issue_31948_2/trait.Bar.html
- [x] inline_cross/issue-31948-2.rs:// @!has issue_31948_2/trait.Woof.html
- [x] inline_cross/issue-31948-2.rs:// @!has issue_31948_2/trait.Bark.html
It doesn't look like `@!matches` is used anywhere.File tree
10 files changed
+16
-13
lines changed- src/test/rustdoc
10 files changed
+16
-13
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
112 | | - | |
| 112 | + | |
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
| |||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | | - | |
| 11 | + | |
| 12 | + | |
13 | 13 | | |
14 | | - | |
15 | | - | |
| 14 | + | |
| 15 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
| 19 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
39 | 38 | | |
40 | 39 | | |
41 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
0 commit comments