diff options
| author | bors <bors@rust-lang.org> | 2023-02-01 01:15:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-01 01:15:02 +0000 |
| commit | ad8e1dc2863f63c35ef3ceef3064d0851a1d2582 (patch) | |
| tree | 64d8db18dc8c8e118fd859c74061a34efbcae9d4 /tests | |
| parent | 5b6ed253c42a69b93e7447fb0874a89ab6bc1cfb (diff) | |
| parent | adc3f8a44b943463577a5f8870da8fd18b749351 (diff) | |
| download | rust-ad8e1dc2863f63c35ef3ceef3064d0851a1d2582.tar.gz | |
Auto merge of #107536 - GuillaumeGomez:rollup-xv7dx2h, r=GuillaumeGomez
Rollup of 12 pull requests
Successful merges:
- #106898 (Include both md and yaml ICE ticket templates)
- #107331 (Clean up eslint annotations and remove unused JS function)
- #107348 (small refactor to new projection code)
- #107354 (rustdoc: update Source Serif 4 from 4.004 to 4.005)
- #107412 (avoid needless checks)
- #107467 (Improve enum checks)
- #107486 (Track bound types like bound regions)
- #107491 (rustdoc: remove unused CSS from `.setting-check`)
- #107508 (`Edition` micro refactor)
- #107525 (PointeeInfo is advisory only)
- #107527 (rustdoc: stop making unstable items transparent)
- #107535 (Replace unwrap with ? in TcpListener doc)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rustdoc/inline_cross/macros.rs | 4 | ||||
| -rw-r--r-- | tests/rustdoc/issue-32374.rs | 4 | ||||
| -rw-r--r-- | tests/rustdoc/reexport-check.rs | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/rustdoc/inline_cross/macros.rs b/tests/rustdoc/inline_cross/macros.rs index d5b0de5725b..b11d5b6c4fa 100644 --- a/tests/rustdoc/inline_cross/macros.rs +++ b/tests/rustdoc/inline_cross/macros.rs @@ -6,9 +6,9 @@ extern crate macros; -// @has foo/index.html '//*[@class="item-left unstable deprecated"]/span[@class="stab deprecated"]' \ +// @has foo/index.html '//*[@class="item-left"]/span[@class="stab deprecated"]' \ // Deprecated -// @has - '//*[@class="item-left unstable deprecated"]/span[@class="stab unstable"]' \ +// @has - '//*[@class="item-left"]/span[@class="stab unstable"]' \ // Experimental // @has foo/macro.my_macro.html diff --git a/tests/rustdoc/issue-32374.rs b/tests/rustdoc/issue-32374.rs index 8296d7a81f2..1153a745b0b 100644 --- a/tests/rustdoc/issue-32374.rs +++ b/tests/rustdoc/issue-32374.rs @@ -2,9 +2,9 @@ #![doc(issue_tracker_base_url = "https://issue_url/")] #![unstable(feature = "test", issue = "32374")] -// @matches issue_32374/index.html '//*[@class="item-left unstable deprecated"]/span[@class="stab deprecated"]' \ +// @matches issue_32374/index.html '//*[@class="item-left"]/span[@class="stab deprecated"]' \ // 'Deprecated' -// @matches issue_32374/index.html '//*[@class="item-left unstable deprecated"]/span[@class="stab unstable"]' \ +// @matches issue_32374/index.html '//*[@class="item-left"]/span[@class="stab unstable"]' \ // 'Experimental' // @matches issue_32374/index.html '//*[@class="item-right docblock-short"]/text()' 'Docs' diff --git a/tests/rustdoc/reexport-check.rs b/tests/rustdoc/reexport-check.rs index acac0c99197..94fa0338532 100644 --- a/tests/rustdoc/reexport-check.rs +++ b/tests/rustdoc/reexport-check.rs @@ -4,7 +4,6 @@ extern crate reexport_check; // @!has 'foo/index.html' '//code' 'pub use self::i32;' -// @has 'foo/index.html' '//div[@class="item-left deprecated"]' 'i32' // @has 'foo/i32/index.html' #[allow(deprecated, deprecated_in_future)] pub use std::i32; @@ -12,6 +11,9 @@ pub use std::i32; // @has 'foo/index.html' '//div[@class="item-left"]' 'String' pub use std::string::String; +// i32 is deprecated, String is not +// @count 'foo/index.html' '//span[@class="stab deprecated"]' 1 + // @has 'foo/index.html' '//div[@class="item-right docblock-short"]' 'Docs in original' // this is a no-op, but shows what happens if there's an attribute that isn't a doc-comment #[doc(inline)] |