Rollup merge of rust-lang#127671 - notriddle:notriddle/issue-d, r=Mar…

…k-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.
jhpratt · Jul 13, 2024 · 6e18eaf · 6e18eaf
2 parents e6af63a 42ee400
commit 6e18eaf
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 16 deletions.
diff --git a/tests/rustdoc/issue-102154.rs → .../rustdoc-ui/ice-assoc-type-loop-102154.rs b/tests/rustdoc/issue-102154.rs → .../rustdoc-ui/ice-assoc-type-loop-102154.rs
@@ -1,3 1,6 @@
 //@ check-pass
 // https://github.com/rust-lang/rust/issues/102154
 
 trait A<Y, N> {
  type B;
 }

diff --git a/tests/rustdoc/issue-100620.rs → ...ce-method-where-clause-circular-100620.rs b/tests/rustdoc/issue-100620.rs → ...ce-method-where-clause-circular-100620.rs
@@ -1,3 1,6 @@
 //@ check-pass
 // https://github.com/rust-lang/rust/issues/100620
 
 pub trait Bar<S> {}
 
 pub trait Qux<T> {}

diff --git a/tests/rustdoc/issue-100241.rs → ...ustdoc-ui/ice-unresolved-import-100241.rs b/tests/rustdoc/issue-100241.rs → ...ustdoc-ui/ice-unresolved-import-100241.rs
@@ -3,6 3,8 @@
 // Check that this isn't an ICE
 //@ should-fail
 
 // https://github.com/rust-lang/rust/issues/100241
 
 mod foo {
  pub use inner::S;
  //~^ ERROR unresolved imports `inner`, `foo::S`

diff --git a/tests/rustdoc/issue-108281.rs → tests/rustdoc/attributes-inlining-108281.rs b/tests/rustdoc/issue-108281.rs → tests/rustdoc/attributes-inlining-108281.rs
diff --git a/tests/rustdoc/issue-101743-bold-tag.rs → tests/rustdoc/bold-tag-101743.rs b/tests/rustdoc/issue-101743-bold-tag.rs → tests/rustdoc/bold-tag-101743.rs
diff --git a/tests/rustdoc/issue-106421-not-internal.rs → ...stable-if-unmarked-106421-not-internal.rs b/tests/rustdoc/issue-106421-not-internal.rs → ...stable-if-unmarked-106421-not-internal.rs
@@ -2,7 2,10 @@
 //@ ignore-cross-compile
 // This is the version where a non-compiler-internal crate inlines a compiler-internal one.
 // In this case, the item shouldn't be documented, because regular users can't get at it.
 // https://github.com/rust-lang/rust/issues/106421
 #![crate_name="bar"]
 
 extern crate foo;
 
-//@ !has issue_106421_not_internal/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
 //@ !has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
 pub use foo::FatalError;
diff --git a/tests/rustdoc/issue-106421.rs → ...tdoc/force-unstable-if-unmarked-106421.rs b/tests/rustdoc/issue-106421.rs → ...tdoc/force-unstable-if-unmarked-106421.rs
@@ -1,8 1,10 @@
 //@ aux-build:issue-106421-force-unstable.rs
 //@ ignore-cross-compile
 //@ compile-flags: -Zforce-unstable-if-unmarked
 // https://github.com/rust-lang/rust/issues/106421
 #![crate_name="bar"]
 
 extern crate foo;
 
-//@ has issue_106421/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
 //@ has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
 pub use foo::FatalError;
diff --git a/tests/rustdoc/issue-105952.rs → ...c/ice-associated-const-equality-105952.rs b/tests/rustdoc/issue-105952.rs → ...c/ice-associated-const-equality-105952.rs
@@ -1,3 1,4 @@
 // https://github.com/rust-lang/rust/issues/105952
 #![crate_name = "foo"]
 
 #![feature(associated_const_equality)]

diff --git a/tests/rustdoc/issue-107995.rs → tests/rustdoc/ice-intra-doc-links-107995.rs b/tests/rustdoc/issue-107995.rs → tests/rustdoc/ice-intra-doc-links-107995.rs
diff --git a/...100204-inline-impl-through-glob-import.rs → ...inline-impl-through-glob-import-100204.rs b/...100204-inline-impl-through-glob-import.rs → ...inline-impl-through-glob-import-100204.rs
@@ -2,6 2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
 // https://github.com/rust-lang/rust/issues/100204
 #![crate_name="second"]
 
 extern crate first;

diff --git a/tests/rustdoc/issue-106142.rs b/tests/rustdoc/issue-106142.rs
diff --git a/tests/rustdoc/issue-108231.rs → ...rustdoc/macro-export-crate-root-108231.rs b/tests/rustdoc/issue-108231.rs → ...rustdoc/macro-export-crate-root-108231.rs
diff --git a/tests/rustdoc/macro-rules-broken-intra-doc-106142.rs b/tests/rustdoc/macro-rules-broken-intra-doc-106142.rs
@@ -0,0 1,17 @@
 // https://github.com/rust-lang/rust/issues/106142
 #![crate_name="foo"]
 
 //@ has 'foo/a/index.html'
 //@ count 'foo/a/index.html' '//ul[@class="item-table"]//li//a' 1
 
 #![allow(rustdoc::broken_intra_doc_links)]
 
 pub mod a {
  /// [`m`]
  pub fn f() {}
 
  #[macro_export]
  macro_rules! m {
  () => {};
  }
 }
diff --git a/...ue-99734-multiple-foreigns-w-same-name.rs → ...oc/multiple-foreigns-w-same-name-99734.rs b/...ue-99734-multiple-foreigns-w-same-name.rs → ...oc/multiple-foreigns-w-same-name-99734.rs
@@ -2,6 2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
 // https://github.com/rust-lang/rust/issues/99734
 #![crate_name = "foo"]
 
 #[macro_use]

diff --git a/...99221-multiple-macro-rules-w-same-name.rs → ...multiple-macro-rules-w-same-name-99221.rs b/...99221-multiple-macro-rules-w-same-name.rs → ...multiple-macro-rules-w-same-name-99221.rs
@@ -2,6 2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
 // https://github.com/rust-lang/rust/issues/99221
 #![crate_name = "foo"]
 
 #[macro_use]

diff --git a/.../issue-99734-multiple-mods-w-same-name.rs → ...ustdoc/multiple-mods-w-same-name-99734.rs b/.../issue-99734-multiple-mods-w-same-name.rs → ...ustdoc/multiple-mods-w-same-name-99734.rs
@@ -2,6 2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
 // https://github.com/rust-lang/rust/issues/99734
 #![crate_name = "foo"]
 
 #[macro_use]

diff --git a/...sue-99221-multiple-structs-w-same-name.rs → ...doc/multiple-structs-w-same-name-99221.rs b/...sue-99221-multiple-structs-w-same-name.rs → ...doc/multiple-structs-w-same-name-99221.rs
@@ -2,6 2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
 // https://github.com/rust-lang/rust/issues/99221
 #![crate_name = "foo"]
 
 #[macro_use]

diff --git a/...oc/issue-105735-overlapping-reexport-2.rs → .../rustdoc/overlapping-reexport-105735-2.rs b/...oc/issue-105735-overlapping-reexport-2.rs → .../rustdoc/overlapping-reexport-105735-2.rs
@@ -1,4 1,5 @@
 // Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
 // https://github.com/rust-lang/rust/issues/105735
 
 #![crate_name = "foo"]
 #![no_std]

diff --git a/...tdoc/issue-105735-overlapping-reexport.rs → tests/rustdoc/overlapping-reexport-105735.rs b/...tdoc/issue-105735-overlapping-reexport.rs → tests/rustdoc/overlapping-reexport-105735.rs
@@ -1,4 1,5 @@
 // Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
 // https://github.com/rust-lang/rust/issues/105735
 
 #![crate_name = "foo"]
 #![no_std]

diff --git a/tests/rustdoc/issue-107350.rs → tests/rustdoc/pub-use-loop-107350.rs b/tests/rustdoc/issue-107350.rs → tests/rustdoc/pub-use-loop-107350.rs
diff --git a/...tdoc/issue-108679-reexport-of-reexport.rs → tests/rustdoc/reexport-of-reexport-108679.rs b/...tdoc/issue-108679-reexport-of-reexport.rs → tests/rustdoc/reexport-of-reexport-108679.rs