Auto merge of rust-lang#118105 - notriddle:master, r=fmease

rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 4) Follow up * rust-lang#116214 * rust-lang#116432 * rust-lang#116824
rust-lang-ci · Nov 24, 2023 · eab8c7d · eab8c7d
2 parents 1fd418f + 4f64ff1
commit eab8c7d
Show file tree

Hide file tree

Showing 32 changed files with 61 additions and 20 deletions.
diff --git a/tests/rustdoc-ui/apit-46976.rs b/tests/rustdoc-ui/apit-46976.rs
@@ -0,0 +1,4 @@
+// check-pass
+// https://github.com/rust-lang/rust/issues/46976
+
+pub fn ice(f: impl Fn()) {}
diff --git a/tests/rustdoc/auxiliary/issue-36031.rs → tests/rustdoc-ui/auxiliary/issue-36031.rs b/tests/rustdoc/auxiliary/issue-36031.rs → tests/rustdoc-ui/auxiliary/issue-36031.rs
diff --git a/tests/rustdoc/auxiliary/issue-40936.rs → tests/rustdoc-ui/auxiliary/issue-40936.rs b/tests/rustdoc/auxiliary/issue-40936.rs → tests/rustdoc-ui/auxiliary/issue-40936.rs
diff --git a/tests/rustdoc/auxiliary/issue-48414.rs → tests/rustdoc-ui/auxiliary/issue-48414.rs b/tests/rustdoc/auxiliary/issue-48414.rs → tests/rustdoc-ui/auxiliary/issue-48414.rs
diff --git a/tests/rustdoc/issue-48414.rs → ...stdoc-ui/circular-intra-doc-link-48414.rs b/tests/rustdoc/issue-48414.rs → ...stdoc-ui/circular-intra-doc-link-48414.rs
@@ -1,4 +1,7 @@
 // aux-build:issue-48414.rs
+// check-pass
+
+// https://github.com/rust-lang/rust/issues/48414
 
 // ICE when resolving paths for a trait that linked to another trait, when both were in an external
 // crate

diff --git a/tests/rustdoc/issue-34423.rs → ...s/rustdoc-ui/hidden-trait-method-34423.rs b/tests/rustdoc/issue-34423.rs → ...s/rustdoc-ui/hidden-trait-method-34423.rs
@@ -1,3 +1,6 @@
+// check-pass
+// https://github.com/rust-lang/rust/issues/34423
+
 pub struct Foo;
 
 pub trait Bar {

diff --git a/tests/rustdoc/issue-36031.rs → ...rustdoc-ui/inherent-assoc-consts-36031.rs b/tests/rustdoc/issue-36031.rs → ...rustdoc-ui/inherent-assoc-consts-36031.rs
@@ -1,7 +1,10 @@
 // aux-build:issue-36031.rs
+// check-pass
 // build-aux-docs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/36031
+
 #![crate_name = "foo"]
 
 extern crate issue_36031;

diff --git a/tests/rustdoc/issue-46271.rs → ...s/rustdoc-ui/nested-extern-crate-46271.rs b/tests/rustdoc/issue-46271.rs → ...s/rustdoc-ui/nested-extern-crate-46271.rs
@@ -1,5 +1,8 @@
+// check-pass
 // hopefully this doesn't cause an ICE
 
+// https://github.com/rust-lang/rust/issues/46271
+
 pub fn foo() {
     extern crate std;
 }
diff --git a/tests/rustdoc/issue-47639.rs → tests/rustdoc-ui/nested-macro-rules-47639.rs b/tests/rustdoc/issue-47639.rs → tests/rustdoc-ui/nested-macro-rules-47639.rs
@@ -1,4 +1,7 @@
+// check-pass
 // This should not ICE
+
+// https://github.com/rust-lang/rust/issues/47639
 pub fn test() {
     macro_rules! foo {
         () => ()

diff --git a/tests/rustdoc/issue-40936.rs → tests/rustdoc-ui/super-glob-40936.rs b/tests/rustdoc/issue-40936.rs → tests/rustdoc-ui/super-glob-40936.rs
@@ -1,6 +1,9 @@
 // aux-build:issue-40936.rs
+// check-pass
 // build-aux-docs
 
+// https://github.com/rust-lang/rust/issues/40936
+
 #![crate_name = "foo"]
 
 extern crate issue_40936;
diff --git a/tests/rustdoc/doctest/auxiliary/empty.rs b/tests/rustdoc/doctest/auxiliary/empty.rs
@@ -0,0 +1 @@
+// intentionally empty
diff --git a/tests/rustdoc/doctest-cfg-feature-30252.rs → ...tdoc/doctest/doctest-cfg-feature-30252.rs b/tests/rustdoc/doctest-cfg-feature-30252.rs → ...tdoc/doctest/doctest-cfg-feature-30252.rs
diff --git a/tests/rustdoc/issue-38129.rs → ...doctest/doctest-crate-attributes-38129.rs b/tests/rustdoc/issue-38129.rs → ...doctest/doctest-crate-attributes-38129.rs
diff --git a/.../rustdoc/doctest-hide-empty-line-23106.rs → .../doctest/doctest-hide-empty-line-23106.rs b/.../rustdoc/doctest-hide-empty-line-23106.rs → .../doctest/doctest-hide-empty-line-23106.rs
diff --git a/tests/rustdoc/doctest-ignore-32556.rs → ...s/rustdoc/doctest/doctest-ignore-32556.rs b/tests/rustdoc/doctest-ignore-32556.rs → ...s/rustdoc/doctest/doctest-ignore-32556.rs
diff --git a/tests/rustdoc/issue-43153.rs → .../rustdoc/doctest/doctest-include-43153.rs b/tests/rustdoc/issue-43153.rs → .../rustdoc/doctest/doctest-include-43153.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/43153
+
 // Test that `include!` in a doc test searches relative to the directory in
 // which the test is declared.
 

diff --git a/tests/rustdoc/issue-38219.rs → tests/rustdoc/doctest/doctest-macro-38219.rs b/tests/rustdoc/issue-38219.rs → tests/rustdoc/doctest/doctest-macro-38219.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/38219
+
 // compile-flags:--test
 // should-fail
 

diff --git a/tests/rustdoc/doctest-manual-crate-name.rs → ...tdoc/doctest/doctest-manual-crate-name.rs b/tests/rustdoc/doctest-manual-crate-name.rs → ...tdoc/doctest/doctest-manual-crate-name.rs
diff --git a/...oc/doctest-markdown-inline-parse-23744.rs → ...st/doctest-markdown-inline-parse-23744.rs b/...oc/doctest-markdown-inline-parse-23744.rs → ...st/doctest-markdown-inline-parse-23744.rs
diff --git a/tests/rustdoc/issue-48377.rs → ...ctest-markdown-trailing-docblock-48377.rs b/tests/rustdoc/issue-48377.rs → ...ctest-markdown-trailing-docblock-48377.rs
@@ -1,5 +1,7 @@
 // compile-flags:--test
 
+// https://github.com/rust-lang/rust/issues/48377
+
 //! This is a doc comment
 //!
 //! ```rust

diff --git a/...octest-multi-line-string-literal-25944.rs → ...octest-multi-line-string-literal-25944.rs b/...octest-multi-line-string-literal-25944.rs → ...octest-multi-line-string-literal-25944.rs
diff --git a/tests/rustdoc/issue-46767.rs → tests/rustdoc/enum-variant-private-46767.rs b/tests/rustdoc/issue-46767.rs → tests/rustdoc/enum-variant-private-46767.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/46767
 #![crate_name = "foo"]
 
 mod private {

diff --git a/tests/rustdoc/issue-43701.rs → .../rustdoc/foreign-implementors-js-43701.rs b/tests/rustdoc/issue-43701.rs → .../rustdoc/foreign-implementors-js-43701.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/43701
 #![crate_name = "foo"]
 
 pub use std::vec::Vec;

diff --git a/tests/rustdoc/issue-34473.rs → tests/rustdoc/inline-rename-34473.rs b/tests/rustdoc/issue-34473.rs → tests/rustdoc/inline-rename-34473.rs
@@ -1,5 +1,7 @@
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/34473
+
 mod second {
     pub struct SomeTypeWithLongName;
 }

diff --git a/tests/rustdoc/issue-46766.rs → ...line_local/enum-variant-reexport-46766.rs b/tests/rustdoc/issue-46766.rs → ...line_local/enum-variant-reexport-46766.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/46766
 #![crate_name = "foo"]
 
 pub enum Enum{Variant}

diff --git a/tests/rustdoc/issue-43893.rs b/tests/rustdoc/issue-43893.rs
diff --git a/tests/rustdoc/issue-46976.rs b/tests/rustdoc/issue-46976.rs
diff --git a/tests/rustdoc/issue-47038.rs → ...s/rustdoc/private-use-decl-macro-47038.rs b/tests/rustdoc/issue-47038.rs → ...s/rustdoc/private-use-decl-macro-47038.rs
@@ -2,6 +2,8 @@
 
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/47038
+
 use std::vec;
 
 // @has 'foo/index.html'

diff --git a/...sue-46506-pub-reexport-of-pub-reexport.rs → ...doc/pub-reexport-of-pub-reexport-46506.rs b/...sue-46506-pub-reexport-of-pub-reexport.rs → ...doc/pub-reexport-of-pub-reexport-46506.rs
diff --git a/tests/rustdoc/src-links-implementor-43893.rs b/tests/rustdoc/src-links-implementor-43893.rs
@@ -0,0 +1,21 @@
+// ignore-cross-compile
+
+// https://github.com/rust-lang/rust/issues/43893
+
+#![crate_name = "foo"]
+
+pub trait SomeTrait {}
+pub struct SomeStruct;
+
+// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#11'
+impl SomeTrait for usize {}
+
+// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#14-16'
+impl SomeTrait for SomeStruct {
+    // deliberately multi-line impl
+}
+
+pub trait AnotherTrait {}
+
+// @has foo/trait.AnotherTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#21'
+impl<T> AnotherTrait for T {}
diff --git a/tests/rustdoc/issue-45584.rs → ...t-implementations-duplicate-self-45584.rs b/tests/rustdoc/issue-45584.rs → ...t-implementations-duplicate-self-45584.rs
@@ -1,5 +1,7 @@
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/45584
+
 pub trait Bar<T, U> {}
 
 // @has 'foo/struct.Foo1.html'

diff --git a/tests/rustdoc/issue-34928.rs → ...ustdoc/tuple-struct-where-clause-34928.rs b/tests/rustdoc/issue-34928.rs → ...ustdoc/tuple-struct-where-clause-34928.rs
@@ -1,5 +1,7 @@
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/34928
+
 pub trait Bar {}
 
 // @has foo/struct.Foo.html '//pre' 'pub struct Foo<T>(pub T) where T: Bar;'