Skip to content

Commit e7c13c3

Browse files
Rollup merge of #123574 - notriddle:notriddle/issue-d, r=fmease
rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 6) Follow up * #116214 * #116432 * #116824 * #118105 * #119561
2 parents ea7eb71 + ecbe327 commit e7c13c3

24 files changed

+69
-33
lines changed

tests/rustdoc/issue-56701.rs renamed to tests/rustdoc-ui/ice-blanket-impl-56701.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
//@ check-pass
12
// This shouldn't cause a stack overflow when rustdoc is run
3+
// https://github.com/rust-lang/rust/issues/56701
24

35
use std::ops::Deref;
46
use std::ops::DerefMut;

tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs renamed to tests/rustdoc-ui/ice-cross-crate-opaque-assoc-type-73061.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
// Regression test for ICE #73061
1+
// Regression test for ICE https://github.com/rust-lang/rust/issues/73061
22

3+
//@ check-pass
34
//@ aux-build:issue-73061.rs
45

56
extern crate issue_73061;

tests/rustdoc/issue-78673.rs renamed to tests/rustdoc/blanket-impl-78673.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// https://github.com/rust-lang/rust/issues/78673
12
#![crate_name = "issue_78673"]
23

34
pub trait Something {}

tests/rustdoc/issue-76501.rs renamed to tests/rustdoc/const-fn-76501.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// @has 'issue_76501/fn.bloop.html' '//pre' 'pub const fn bloop() -> i32'
1+
// https://github.com/rust-lang/rust/issues/76501
2+
#![crate_name="foo"]
3+
4+
// @has 'foo/fn.bloop.html' '//pre' 'pub const fn bloop() -> i32'
25
/// A useless function that always returns 1.
36
pub const fn bloop() -> i32 {
47
1
@@ -8,7 +11,7 @@ pub const fn bloop() -> i32 {
811
pub struct Struct {}
912

1013
impl Struct {
11-
// @has 'issue_76501/struct.Struct.html' '//*[@class="method"]' \
14+
// @has 'foo/struct.Struct.html' '//*[@class="method"]' \
1215
// 'pub const fn blurp() -> i32'
1316
/// A useless function that always returns 1.
1417
pub const fn blurp() -> i32 {

tests/rustdoc/issue-79201.rs renamed to tests/rustdoc/doc-cfg-inherit-from-module-79201.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
// https://github.com/rust-lang/rust/issues/79201
2+
#![crate_name="foo"]
3+
14
#![feature(doc_cfg)]
25

3-
// @has 'issue_79201/trait.Foo.html'
6+
// @has 'foo/trait.Foo.html'
47
// @count - '//*[@class="stab portability"]' 6
58
// @matches - '//*[@class="stab portability"]' 'crate feature foo-root'
69
// @matches - '//*[@class="stab portability"]' 'crate feature foo-public-mod'
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
//@ compile-flags: -Zunstable-options --document-private-items --document-hidden-items
2+
// https://github.com/rust-lang/rust/issues/67851
3+
#![crate_name="foo"]
24

3-
// @has issue_67851_both/struct.Hidden.html
5+
// @has foo/struct.Hidden.html
46
#[doc(hidden)]
57
pub struct Hidden;
68

7-
// @has issue_67851_both/struct.Private.html
9+
// @has foo/struct.Private.html
810
struct Private;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//@ compile-flags: -Zunstable-options --document-hidden-items
2+
// https://github.com/rust-lang/rust/issues/67851
3+
#![crate_name="foo"]
4+
5+
// @has foo/struct.Hidden.html
6+
#[doc(hidden)]
7+
pub struct Hidden;
8+
9+
// @!has foo/struct.Private.html
10+
struct Private;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// https://github.com/rust-lang/rust/issues/67851
2+
#![crate_name="foo"]
3+
4+
// @!has foo/struct.Hidden.html
5+
#[doc(hidden)]
6+
pub struct Hidden;
7+
8+
// @!has foo/struct.Private.html
9+
struct Private;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//@ compile-flags: --document-private-items
2+
// https://github.com/rust-lang/rust/issues/67851
3+
#![crate_name="foo"]
4+
5+
// @!has foo/struct.Hidden.html
6+
#[doc(hidden)]
7+
pub struct Hidden;
8+
9+
// @has foo/struct.Private.html
10+
struct Private;

0 commit comments

Comments
 (0)