Skip to content
/ rust Public
forked from rust-lang/rust

Commit 6e18eaf

Browse files
authored
Rollup merge of rust-lang#127671 - notriddle:notriddle/issue-d, r=Mark-Simulacrum
rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 8) Follow up * rust-lang#116214 * rust-lang#116432 * rust-lang#116824 * rust-lang#118105 * rust-lang#119561 * rust-lang#123574 * rust-lang#125382 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 e6af63a + 42ee400 commit 6e18eaf

21 files changed

+40
-16
lines changed

tests/rustdoc/issue-102154.rs renamed to tests/rustdoc-ui/ice-assoc-type-loop-102154.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//@ check-pass
2+
// https://github.com/rust-lang/rust/issues/102154
3+
14
trait A<Y, N> {
25
type B;
36
}

tests/rustdoc/issue-100620.rs renamed to tests/rustdoc-ui/ice-method-where-clause-circular-100620.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//@ check-pass
2+
// https://github.com/rust-lang/rust/issues/100620
3+
14
pub trait Bar<S> {}
25

36
pub trait Qux<T> {}

tests/rustdoc/issue-100241.rs renamed to tests/rustdoc-ui/ice-unresolved-import-100241.rs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// Check that this isn't an ICE
44
//@ should-fail
55

6+
// https://github.com/rust-lang/rust/issues/100241
7+
68
mod foo {
79
pub use inner::S;
810
//~^ ERROR unresolved imports `inner`, `foo::S`

tests/rustdoc/issue-106421-not-internal.rs renamed to tests/rustdoc/force-unstable-if-unmarked-106421-not-internal.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
//@ ignore-cross-compile
33
// This is the version where a non-compiler-internal crate inlines a compiler-internal one.
44
// In this case, the item shouldn't be documented, because regular users can't get at it.
5+
// https://github.com/rust-lang/rust/issues/106421
6+
#![crate_name="bar"]
7+
58
extern crate foo;
69

7-
//@ !has issue_106421_not_internal/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
10+
//@ !has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
811
pub use foo::FatalError;
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
//@ aux-build:issue-106421-force-unstable.rs
22
//@ ignore-cross-compile
33
//@ compile-flags: -Zforce-unstable-if-unmarked
4+
// https://github.com/rust-lang/rust/issues/106421
5+
#![crate_name="bar"]
46

57
extern crate foo;
68

7-
//@ has issue_106421/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
9+
//@ has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
810
pub use foo::FatalError;

tests/rustdoc/issue-105952.rs renamed to tests/rustdoc/ice-associated-const-equality-105952.rs

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

34
#![feature(associated_const_equality)]

tests/rustdoc/issue-100204-inline-impl-through-glob-import.rs renamed to tests/rustdoc/inline-impl-through-glob-import-100204.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ build-aux-docs
33
//@ ignore-cross-compile
44

5+
// https://github.com/rust-lang/rust/issues/100204
56
#![crate_name="second"]
67

78
extern crate first;

tests/rustdoc/issue-106142.rs

-14
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// https://github.com/rust-lang/rust/issues/106142
2+
#![crate_name="foo"]
3+
4+
//@ has 'foo/a/index.html'
5+
//@ count 'foo/a/index.html' '//ul[@class="item-table"]//li//a' 1
6+
7+
#![allow(rustdoc::broken_intra_doc_links)]
8+
9+
pub mod a {
10+
/// [`m`]
11+
pub fn f() {}
12+
13+
#[macro_export]
14+
macro_rules! m {
15+
() => {};
16+
}
17+
}

tests/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs renamed to tests/rustdoc/multiple-foreigns-w-same-name-99734.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ build-aux-docs
33
//@ ignore-cross-compile
44

5+
// https://github.com/rust-lang/rust/issues/99734
56
#![crate_name = "foo"]
67

78
#[macro_use]

tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs renamed to tests/rustdoc/multiple-macro-rules-w-same-name-99221.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ build-aux-docs
33
//@ ignore-cross-compile
44

5+
// https://github.com/rust-lang/rust/issues/99221
56
#![crate_name = "foo"]
67

78
#[macro_use]

tests/rustdoc/issue-99734-multiple-mods-w-same-name.rs renamed to tests/rustdoc/multiple-mods-w-same-name-99734.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ build-aux-docs
33
//@ ignore-cross-compile
44

5+
// https://github.com/rust-lang/rust/issues/99734
56
#![crate_name = "foo"]
67

78
#[macro_use]

tests/rustdoc/issue-99221-multiple-structs-w-same-name.rs renamed to tests/rustdoc/multiple-structs-w-same-name-99221.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ build-aux-docs
33
//@ ignore-cross-compile
44

5+
// https://github.com/rust-lang/rust/issues/99221
56
#![crate_name = "foo"]
67

78
#[macro_use]

tests/rustdoc/issue-105735-overlapping-reexport-2.rs renamed to tests/rustdoc/overlapping-reexport-105735-2.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
2+
// https://github.com/rust-lang/rust/issues/105735
23

34
#![crate_name = "foo"]
45
#![no_std]

tests/rustdoc/issue-105735-overlapping-reexport.rs renamed to tests/rustdoc/overlapping-reexport-105735.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
2+
// https://github.com/rust-lang/rust/issues/105735
23

34
#![crate_name = "foo"]
45
#![no_std]
File renamed without changes.

0 commit comments

Comments
 (0)