Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 1a5ebc9

Browse files
authored
Rollup merge of rust-lang#136258 - notriddle:notriddle/issue-d, r=fmease
rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 11) Follow up * rust-lang#134053 * rust-lang#130287 et al As always, it's easier to review the commits one at a time. Don't use the Files Changed tab. It's confusing.
2 parents 7f05c7e + c17d568 commit 1a5ebc9

20 files changed

+79
-32
lines changed

tests/rustdoc/intra-doc/issue-104145.rs renamed to tests/rustdoc-ui/intra-doc/ice-extern-trait-local-impl-104145.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com/rust-lang/rust/issues/104145
2+
//@ check-pass
3+
14
// Doc links in `Trait`'s methods are resolved because it has a local impl.
25

36
//@ aux-build:issue-103463-aux.rs

tests/rustdoc/intra-doc/issue-103463.rs renamed to tests/rustdoc-ui/intra-doc/ice-priv-use-103463.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com/rust-lang/rust/issues/103463
2+
//@ check-pass
3+
14
// The `Trait` is not pulled into the crate resulting in doc links in its methods being resolved.
25

36
//@ aux-build:issue-103463-aux.rs

tests/rustdoc/inline_cross/issue-28480.rs renamed to tests/rustdoc/inline_cross/doc-hidden-broken-link-28480.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com/rust-lang/rust/issues/28480
2+
#![crate_name="foobar"]
3+
14
//@ aux-build:rustdoc-hidden-sig.rs
25
//@ build-aux-docs
36
//@ ignore-cross-compile
@@ -7,7 +10,7 @@
710
//@ has - '//a' 'u8'
811
extern crate rustdoc_hidden_sig;
912

10-
//@ has issue_28480/struct.Bar.html
13+
//@ has foobar/struct.Bar.html
1114
//@ !has - '//a/@title' 'Hidden'
1215
//@ has - '//a' 'u8'
1316
pub use rustdoc_hidden_sig::Bar;
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1+
// https://github.com/rust-lang/rust/issues/31948
2+
#![crate_name="foobar"]
3+
14
//@ aux-build:rustdoc-nonreachable-impls.rs
25
//@ build-aux-docs
36
//@ ignore-cross-compile
47

58
extern crate rustdoc_nonreachable_impls;
69

7-
//@ has issue_31948_1/struct.Wobble.html
10+
//@ has foobar/struct.Wobble.html
811
//@ has - '//*[@class="impl"]//h3[@class="code-header"]' 'Bark for'
912
//@ has - '//*[@class="impl"]//h3[@class="code-header"]' 'Woof for'
1013
//@ !has - '//*[@class="impl"]//h3[@class="code-header"]' 'Bar for'
1114
//@ !has - '//*[@class="impl"]//h3[@class="code-header"]' 'Qux for'
1215
pub use rustdoc_nonreachable_impls::hidden::Wobble;
1316

14-
//@ has issue_31948_1/trait.Bark.html
17+
//@ has foobar/trait.Bark.html
1518
//@ has - '//h3[@class="code-header"]' 'for Foo'
1619
//@ has - '//h3[@class="code-header"]' 'for Wobble'
1720
//@ !has - '//h3[@class="code-header"]' 'for Wibble'
1821
pub use rustdoc_nonreachable_impls::Bark;
1922

20-
//@ has issue_31948_1/trait.Woof.html
23+
//@ has foobar/trait.Woof.html
2124
//@ has - '//h3[@class="code-header"]' 'for Foo'
2225
//@ has - '//h3[@class="code-header"]' 'for Wobble'
2326
//@ !has - '//h3[@class="code-header"]' 'for Wibble'
2427
pub use rustdoc_nonreachable_impls::Woof;
2528

26-
//@ !has issue_31948_1/trait.Bar.html
27-
//@ !has issue_31948_1/trait.Qux.html
29+
//@ !has foobar/trait.Bar.html
30+
//@ !has foobar/trait.Qux.html
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1+
// https://github.com/rust-lang/rust/issues/31948
2+
#![crate_name="foobar"]
3+
14
//@ aux-build:rustdoc-nonreachable-impls.rs
25
//@ build-aux-docs
36
//@ ignore-cross-compile
47

58
extern crate rustdoc_nonreachable_impls;
69

7-
//@ has issue_31948_2/struct.Wobble.html
10+
//@ has foobar/struct.Wobble.html
811
//@ has - '//*[@class="impl"]//h3[@class="code-header"]' 'Qux for'
912
//@ has - '//*[@class="impl"]//h3[@class="code-header"]' 'Bark for'
1013
//@ has - '//*[@class="impl"]//h3[@class="code-header"]' 'Woof for'
1114
//@ !has - '//*[@class="impl"]//h3[@class="code-header"]' 'Bar for'
1215
pub use rustdoc_nonreachable_impls::hidden::Wobble;
1316

14-
//@ has issue_31948_2/trait.Qux.html
17+
//@ has foobar/trait.Qux.html
1518
//@ has - '//h3[@class="code-header"]' 'for Foo'
1619
//@ has - '//h3[@class="code-header"]' 'for Wobble'
1720
pub use rustdoc_nonreachable_impls::hidden::Qux;
1821

19-
//@ !has issue_31948_2/trait.Bar.html
20-
//@ !has issue_31948_2/trait.Woof.html
21-
//@ !has issue_31948_2/trait.Bark.html
22+
//@ !has foobar/trait.Bar.html
23+
//@ !has foobar/trait.Woof.html
24+
//@ !has foobar/trait.Bark.html
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
1+
// https://github.com/rust-lang/rust/issues/31948
2+
#![crate_name="foobar"]
3+
14
//@ aux-build:rustdoc-nonreachable-impls.rs
25
//@ build-aux-docs
36
//@ ignore-cross-compile
47

58
extern crate rustdoc_nonreachable_impls;
69

7-
//@ has issue_31948/struct.Foo.html
10+
//@ has foobar/struct.Foo.html
811
//@ has - '//*[@class="impl"]//h3[@class="code-header"]' 'Bark for'
912
//@ has - '//*[@class="impl"]//h3[@class="code-header"]' 'Woof for'
1013
//@ !has - '//*[@class="impl"]//h3[@class="code-header"]' 'Bar for'
1114
//@ !has - '//*[@class="impl"]//h3[@class="code-header"]' 'Qux for'
1215
pub use rustdoc_nonreachable_impls::Foo;
1316

14-
//@ has issue_31948/trait.Bark.html
17+
//@ has foobar/trait.Bark.html
1518
//@ has - '//h3[@class="code-header"]' 'for Foo'
1619
//@ !has - '//h3[@class="code-header"]' 'for Wibble'
1720
//@ !has - '//h3[@class="code-header"]' 'for Wobble'
1821
pub use rustdoc_nonreachable_impls::Bark;
1922

20-
//@ has issue_31948/trait.Woof.html
23+
//@ has foobar/trait.Woof.html
2124
//@ has - '//h3[@class="code-header"]' 'for Foo'
2225
//@ !has - '//h3[@class="code-header"]' 'for Wibble'
2326
//@ !has - '//h3[@class="code-header"]' 'for Wobble'
2427
pub use rustdoc_nonreachable_impls::Woof;
2528

26-
//@ !has issue_31948/trait.Bar.html
27-
//@ !has issue_31948/trait.Qux.html
28-
//@ !has issue_31948/struct.Wibble.html
29-
//@ !has issue_31948/struct.Wobble.html
29+
//@ !has foobar/trait.Bar.html
30+
//@ !has foobar/trait.Qux.html
31+
//@ !has foobar/struct.Wibble.html
32+
//@ !has foobar/struct.Wobble.html

tests/rustdoc/inline_cross/issue-32881.rs renamed to tests/rustdoc/inline_cross/impl-dyn-trait-32881.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
// https://github.com/rust-lang/rust/issues/32881
2+
#![crate_name="foobar"]
3+
14
//@ aux-build:rustdoc-trait-object-impl.rs
25
//@ build-aux-docs
36
//@ ignore-cross-compile
47

58
extern crate rustdoc_trait_object_impl;
69

7-
//@ has issue_32881/trait.Bar.html
10+
//@ has foobar/trait.Bar.html
811
//@ has - '//h3[@class="code-header"]' "impl<'a> dyn Bar"
912
//@ has - '//h3[@class="code-header"]' "impl<'a> Debug for dyn Bar"
1013

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
// https://github.com/rust-lang/rust/issues/33113
2+
#![crate_name="foobar"]
3+
14
//@ aux-build:issue-33113.rs
25
//@ build-aux-docs
36
//@ ignore-cross-compile
47

58
extern crate bar;
69

7-
//@ has issue_33113/trait.Bar.html
10+
//@ has foobar/trait.Bar.html
811
//@ has - '//h3[@class="code-header"]' "for &'a char"
912
//@ has - '//h3[@class="code-header"]' "for Foo"
1013
pub use bar::Bar;

tests/rustdoc/inline_cross/issue-76736-1.rs renamed to tests/rustdoc/inline_cross/rustc-private-76736-1.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// https://github.com/rust-lang/rust/issues/76736
2+
13
//@ aux-build:issue-76736-1.rs
24
//@ aux-build:issue-76736-2.rs
35

0 commit comments

Comments
 (0)