Skip to content

Commit aabe53b

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

24 files changed

+69
-33
lines changed

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

+2
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

+2-1
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

+1
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

+5-2
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

+4-1
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'
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;
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;
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;
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;

tests/rustdoc/issue-74083.rs renamed to tests/rustdoc/hide-mut-methods-if-no-derefmut-impl-74083.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com./rust-lang/rust/issues/74083
2+
#![crate_name="foo"]
3+
14
use std::ops::Deref;
25

36
pub struct Foo;
@@ -6,7 +9,7 @@ impl Foo {
69
pub fn foo(&mut self) {}
710
}
811

9-
// @has issue_74083/struct.Bar.html
12+
// @has foo/struct.Bar.html
1013
// @!has - '//div[@class="sidebar-links"]/a[@href="#method.foo"]' 'foo'
1114
pub struct Bar {
1215
foo: Foo,

tests/rustdoc/issue-75588.rs renamed to tests/rustdoc/implementors-unstable-75588.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ aux-build:real_gimli.rs
33

44
// Ensure unstably exported traits have their Implementors sections.
5+
// https://github.com./rust-lang/rust/issues/75588
56

67
#![crate_name = "foo"]
78
#![feature(extremely_unstable_foo)]

tests/rustdoc/issue-57180.rs renamed to tests/rustdoc/inline_cross/ice-import-crate-57180.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ aux-build:issue-57180.rs
2+
// https://github.com./rust-lang/rust/issues/57180
23

34
extern crate issue_57180;
45
use issue_57180::Trait;

tests/rustdoc/issue-72340.rs renamed to tests/rustdoc/intra-doc-link-method-trait-impl-72340.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// https://github.com./rust-lang/rust/issues/72340
2+
13
#![crate_name = "foo"]
24

35
pub struct Body;

tests/rustdoc/issue-67851-hidden.rs

-8
This file was deleted.

tests/rustdoc/issue-67851-neither.rs

-6
This file was deleted.

tests/rustdoc/issue-67851-private.rs

-8
This file was deleted.

tests/rustdoc/issue-60482.rs renamed to tests/rustdoc/markdown-60482.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// This code caused a panic in `pulldown-cmark` 0.4.1.
2+
// https://github.com./rust-lang/rust/issues/60482
23

34
pub const BASIC_UNICODE: bool = true;
45

tests/rustdoc/issue-78701.rs renamed to tests/rustdoc/sidebar-trait-impl-disambiguate-78701.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// https://github.com./rust-lang/rust/issues/78701
12
#![crate_name = "foo"]
23

34
// This test ensures that if a blanket impl has the same ID as another impl, it'll

tests/rustdoc/issue-56822.rs renamed to tests/rustdoc/synthetic_auto/auto-trait-lifetimes-56822.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com./rust-lang/rust/issues/56822
2+
#![crate_name="foo"]
3+
14
struct Wrapper<T>(T);
25

36
trait MyTrait {
@@ -16,7 +19,7 @@ impl<'a, T> MyTrait for Inner<'a, T> {
1619
type Output = &'a T;
1720
}
1821

19-
// @has issue_56822/struct.Parser.html
22+
// @has foo/struct.Parser.html
2023
// @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \
2124
// "impl<'a> Send for Parser<'a>"
2225
pub struct Parser<'a> {

tests/rustdoc/issue-60726.rs renamed to tests/rustdoc/synthetic_auto/send-impl-conditional-60726.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// https://github.com./rust-lang/rust/issues/60726
2+
#![crate_name="foo"]
3+
14
use std::marker::PhantomData;
25

36
pub struct True;
@@ -25,7 +28,7 @@ where
2528
I:InterfaceType<Send=True>
2629
{}
2730

28-
// @has issue_60726/struct.IntoIter.html
31+
// @has foo/struct.IntoIter.html
2932
// @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \
3033
// "impl<T> !Send for IntoIter<T>"
3134
// @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \

tests/rustdoc/issue-61592.rs renamed to tests/rustdoc/underscore-import-61592.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
//@ aux-build:issue-61592.rs
2+
// https://github.com./rust-lang/rust/issues/61592
3+
#![crate_name="bar"]
24

35
extern crate foo;
46

5-
// @has issue_61592/index.html
7+
// @has bar/index.html
68
// @has - '//a[@href="#reexports"]' 'Re-exports'
79
// @has - '//code' 'pub use foo::FooTrait as _;'
810
// @!has - '//a[@href="trait._.html"]' ''
911
pub use foo::FooTrait as _;
1012

11-
// @has issue_61592/index.html
13+
// @has bar/index.html
1214
// @has - '//a[@href="#reexports"]' 'Re-exports'
1315
// @has - '//code' 'pub use foo::FooStruct as _;'
1416
// @!has - '//a[@href="struct._.html"]' ''

0 commit comments

Comments
 (0)