From b5c9982c0a0888bfc21e3a2c5c11575ecf2d1fb8 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Wed, 3 Jan 2024 14:56:10 -0700 Subject: [PATCH 1/5] Add `crate_name` and URL to test cases --- tests/rustdoc/issue-35169-2.rs | 5 +++- tests/rustdoc/issue-35169.rs | 5 +++- tests/rustdoc/issue-35488.rs | 9 ++++--- tests/rustdoc/issue-41783.rs | 5 +++- tests/rustdoc/issue-42760.rs | 5 +++- tests/rustdoc/issue-43869.rs | 27 ++++++++++--------- tests/rustdoc/issue-46377.rs | 5 +++- tests/rustdoc/issue-46380-2.rs | 5 +++- tests/rustdoc/issue-46727.rs | 5 +++- .../issue-47197-blank-line-in-doc-block.rs | 5 +++- tests/rustdoc/issue-50159.rs | 5 +++- tests/rustdoc/issue-51236.rs | 5 +++- tests/rustdoc/issue-52873.rs | 3 +++ tests/rustdoc/issue-53689.rs | 1 + tests/rustdoc/issue-53812.rs | 5 +++- tests/rustdoc/issue-54478-demo-allocator.rs | 3 +++ tests/rustdoc/issue-54705.rs | 5 +++- tests/rustdoc/issue-55001.rs | 3 +++ tests/rustdoc/issue-55321.rs | 7 +++-- tests/rustdoc/issue-55364.rs | 19 +++++++------ 20 files changed, 95 insertions(+), 37 deletions(-) diff --git a/tests/rustdoc/issue-35169-2.rs b/tests/rustdoc/issue-35169-2.rs index f08466baf8b05..c82323ddc6aac 100644 --- a/tests/rustdoc/issue-35169-2.rs +++ b/tests/rustdoc/issue-35169-2.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/35169 +#![crate_name="foo"] + use std::ops::Deref; use std::ops::DerefMut; @@ -23,7 +26,7 @@ impl DerefMut for Bar { fn deref_mut(&mut self) -> &mut Foo { loop {} } } -// @has issue_35169_2/struct.Bar.html +// @has foo/struct.Bar.html // @has - '//*[@id="method.by_ref"]//h4[@class="code-header"]' 'fn by_ref(&self)' // @has - '//*[@id="method.by_ref"]' 'fn by_ref(&self)' // @has - '//*[@id="method.by_explicit_ref"]//h4[@class="code-header"]' 'fn by_explicit_ref(self: &Foo)' diff --git a/tests/rustdoc/issue-35169.rs b/tests/rustdoc/issue-35169.rs index 70a2265c80632..44afaf2e903ac 100644 --- a/tests/rustdoc/issue-35169.rs +++ b/tests/rustdoc/issue-35169.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/35169 +#![crate_name="foo"] + use std::ops::Deref; pub struct Foo; @@ -18,7 +21,7 @@ impl Deref for Bar { fn deref(&self) -> &Foo { loop {} } } -// @has issue_35169/struct.Bar.html +// @has foo/struct.Bar.html // @has - '//*[@id="method.by_ref"]//h4[@class="code-header"]' 'fn by_ref(&self)' // @has - '//*[@id="method.by_ref"]' 'fn by_ref(&self)' // @has - '//*[@id="method.by_explicit_ref"]//h4[@class="code-header"]' 'fn by_explicit_ref(self: &Foo)' diff --git a/tests/rustdoc/issue-35488.rs b/tests/rustdoc/issue-35488.rs index c1bf9ceeac1cc..ed955dcd770ae 100644 --- a/tests/rustdoc/issue-35488.rs +++ b/tests/rustdoc/issue-35488.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/35488 +#![crate_name="foo"] + mod foo { pub enum Foo { Bar, @@ -5,9 +8,9 @@ mod foo { pub use self::Foo::*; } -// @has 'issue_35488/index.html' '//code' 'pub use self::Foo::*;' -// @has 'issue_35488/enum.Foo.html' +// @has 'foo/index.html' '//code' 'pub use self::Foo::*;' +// @has 'foo/enum.Foo.html' pub use self::foo::*; -// @has 'issue_35488/index.html' '//code' 'pub use std::option::Option::None;' +// @has 'foo/index.html' '//code' 'pub use std::option::Option::None;' pub use std::option::Option::None; diff --git a/tests/rustdoc/issue-41783.rs b/tests/rustdoc/issue-41783.rs index 7578d49daa508..7782e148fd9f2 100644 --- a/tests/rustdoc/issue-41783.rs +++ b/tests/rustdoc/issue-41783.rs @@ -1,4 +1,7 @@ -// @has issue_41783/struct.Foo.html +// https://github.com/rust-lang/rust/issues/41783 +#![crate_name="foo"] + +// @has foo/struct.Foo.html // @!hasraw - 'space' // @!hasraw - 'comment' // @hasraw - '#[outer]' diff --git a/tests/rustdoc/issue-42760.rs b/tests/rustdoc/issue-42760.rs index a5394c7d92a96..16c1705eb00cf 100644 --- a/tests/rustdoc/issue-42760.rs +++ b/tests/rustdoc/issue-42760.rs @@ -1,6 +1,9 @@ +// https://github.com/rust-lang/rust/issues/42760 +#![crate_name="foo"] + #![allow(rustdoc::invalid_rust_codeblocks)] -// @has issue_42760/struct.NonGen.html +// @has foo/struct.NonGen.html // @has - '//h2' 'Example' /// Item docs. diff --git a/tests/rustdoc/issue-43869.rs b/tests/rustdoc/issue-43869.rs index 767d09d855888..9c4ed841f797a 100644 --- a/tests/rustdoc/issue-43869.rs +++ b/tests/rustdoc/issue-43869.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/43869 +#![crate_name="foo"] + pub fn g() -> impl Iterator { Some(1u8).into_iter() } @@ -58,15 +61,15 @@ pub fn test_44731_4() -> Box> { Box::new(g()) } -// @has issue_43869/fn.g.html -// @has issue_43869/fn.h.html -// @has issue_43869/fn.i.html -// @has issue_43869/fn.j.html -// @has issue_43869/fn.k.html -// @has issue_43869/fn.l.html -// @has issue_43869/fn.m.html -// @has issue_43869/fn.n.html -// @has issue_43869/fn.o.html -// @has issue_43869/fn.test_44731_0.html -// @has issue_43869/fn.test_44731_1.html -// @has issue_43869/fn.test_44731_4.html +// @has foo/fn.g.html +// @has foo/fn.h.html +// @has foo/fn.i.html +// @has foo/fn.j.html +// @has foo/fn.k.html +// @has foo/fn.l.html +// @has foo/fn.m.html +// @has foo/fn.n.html +// @has foo/fn.o.html +// @has foo/fn.test_44731_0.html +// @has foo/fn.test_44731_1.html +// @has foo/fn.test_44731_4.html diff --git a/tests/rustdoc/issue-46377.rs b/tests/rustdoc/issue-46377.rs index 1311b4721e2f7..aec74f493d433 100644 --- a/tests/rustdoc/issue-46377.rs +++ b/tests/rustdoc/issue-46377.rs @@ -1,3 +1,6 @@ -// @has 'issue_46377/index.html' '//*[@class="desc docblock-short"]' 'Check out this struct!' +// https://github.com/rust-lang/rust/issues/46377 +#![crate_name="foo"] + +// @has 'foo/index.html' '//*[@class="desc docblock-short"]' 'Check out this struct!' /// # Check out this struct! pub struct SomeStruct; diff --git a/tests/rustdoc/issue-46380-2.rs b/tests/rustdoc/issue-46380-2.rs index 7004d18dc66c9..96ebd888eb5c3 100644 --- a/tests/rustdoc/issue-46380-2.rs +++ b/tests/rustdoc/issue-46380-2.rs @@ -1,6 +1,9 @@ +// https://github.com/rust-lang/rust/issues/46380 +#![crate_name="foo"] + pub trait PublicTrait {} -// @has issue_46380_2/struct.PublicStruct.html +// @has foo/struct.PublicStruct.html pub struct PublicStruct; // @!has - '//*[@class="impl"]' 'impl PublicTrait for PublicStruct' diff --git a/tests/rustdoc/issue-46727.rs b/tests/rustdoc/issue-46727.rs index 8cfc4827a7f4c..d0ce9c34f51b9 100644 --- a/tests/rustdoc/issue-46727.rs +++ b/tests/rustdoc/issue-46727.rs @@ -1,7 +1,10 @@ +// https://github.com/rust-lang/rust/issues/46727 +#![crate_name="foo"] + // aux-build:issue-46727.rs extern crate issue_46727; -// @has issue_46727/trait.Foo.html +// @has foo/trait.Foo.html // @has - '//h3[@class="code-header"]' 'impl Foo for Bar<[T; 3]>' pub use issue_46727::{Foo, Bar}; diff --git a/tests/rustdoc/issue-47197-blank-line-in-doc-block.rs b/tests/rustdoc/issue-47197-blank-line-in-doc-block.rs index 19994475de27c..79492b4fa769d 100644 --- a/tests/rustdoc/issue-47197-blank-line-in-doc-block.rs +++ b/tests/rustdoc/issue-47197-blank-line-in-doc-block.rs @@ -1,4 +1,7 @@ -// @has issue_47197_blank_line_in_doc_block/fn.whose_woods_these_are_i_think_i_know.html +// https://github.com/rust-lang/rust/issues/47197 +#![crate_name="foo"] + +// @has foo/fn.whose_woods_these_are_i_think_i_know.html /** * snow diff --git a/tests/rustdoc/issue-50159.rs b/tests/rustdoc/issue-50159.rs index 13bedd5dbb023..0663ed5fc81ff 100644 --- a/tests/rustdoc/issue-50159.rs +++ b/tests/rustdoc/issue-50159.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/50159 +#![crate_name="foo"] + pub trait Signal { type Item; } @@ -10,7 +13,7 @@ impl Signal2 for B where B: Signal { type Item2 = C; } -// @has issue_50159/struct.Switch.html +// @has foo/struct.Switch.html // @has - '//h3[@class="code-header"]' 'impl Send for Switchwhere ::Item: Send' // @has - '//h3[@class="code-header"]' 'impl Sync for Switchwhere ::Item: Sync' // @count - '//*[@id="implementations-list"]//*[@class="impl"]' 0 diff --git a/tests/rustdoc/issue-51236.rs b/tests/rustdoc/issue-51236.rs index 04664805a886f..30c81e796013c 100644 --- a/tests/rustdoc/issue-51236.rs +++ b/tests/rustdoc/issue-51236.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/51236 +#![crate_name="foo"] + use std::marker::PhantomData; pub mod traits { @@ -6,7 +9,7 @@ pub mod traits { } } -// @has issue_51236/struct.Owned.html +// @has foo/struct.Owned.html // @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \ // "impl Send for Ownedwhere >::Reader: Send" pub struct Owned where T: for<'a> ::traits::Owned<'a> { diff --git a/tests/rustdoc/issue-52873.rs b/tests/rustdoc/issue-52873.rs index 8000ce73bd42f..12d3e3d7f944c 100644 --- a/tests/rustdoc/issue-52873.rs +++ b/tests/rustdoc/issue-52873.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/52873 +#![crate_name="foo"] + // Regression test for #52873. We used to ICE due to unexpected // overflows when checking for "blanket impl inclusion". diff --git a/tests/rustdoc/issue-53689.rs b/tests/rustdoc/issue-53689.rs index 832140e061b51..7c2edd01a6091 100644 --- a/tests/rustdoc/issue-53689.rs +++ b/tests/rustdoc/issue-53689.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/53689 // aux-build:issue-53689.rs #![crate_name = "foo"] diff --git a/tests/rustdoc/issue-53812.rs b/tests/rustdoc/issue-53812.rs index dc1eb304c3d1d..968ae0350433a 100644 --- a/tests/rustdoc/issue-53812.rs +++ b/tests/rustdoc/issue-53812.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/53812 +#![crate_name="foo"] + pub trait MyIterator {} pub struct MyStruct(T); @@ -11,7 +14,7 @@ macro_rules! array_impls { } } -// @has issue_53812/trait.MyIterator.html +// @has foo/trait.MyIterator.html // @has - '//*[@id="implementors-list"]/*[@class="impl"][1]' 'MyStruct<[T; 0]>' // @has - '//*[@id="implementors-list"]/*[@class="impl"][2]' 'MyStruct<[T; 1]>' // @has - '//*[@id="implementors-list"]/*[@class="impl"][3]' 'MyStruct<[T; 2]>' diff --git a/tests/rustdoc/issue-54478-demo-allocator.rs b/tests/rustdoc/issue-54478-demo-allocator.rs index 4811f363bc97a..39acee36d8897 100644 --- a/tests/rustdoc/issue-54478-demo-allocator.rs +++ b/tests/rustdoc/issue-54478-demo-allocator.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/54478 +#![crate_name="foo"] + // Issue #54478: regression test showing that we can demonstrate // `#[global_allocator]` in code blocks built by `rustdoc`. // diff --git a/tests/rustdoc/issue-54705.rs b/tests/rustdoc/issue-54705.rs index a886eb0de242c..00be0042fb03b 100644 --- a/tests/rustdoc/issue-54705.rs +++ b/tests/rustdoc/issue-54705.rs @@ -1,6 +1,9 @@ +// https://github.com/rust-lang/rust/issues/54705 +#![crate_name="foo"] + pub trait ScopeHandle<'scope> {} -// @has issue_54705/struct.ScopeFutureContents.html +// @has foo/struct.ScopeFutureContents.html // @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \ // "impl<'scope, S> Send for ScopeFutureContents<'scope, S>where S: Sync" // diff --git a/tests/rustdoc/issue-55001.rs b/tests/rustdoc/issue-55001.rs index f6c7f9a3d082c..b7d86a1c843bd 100644 --- a/tests/rustdoc/issue-55001.rs +++ b/tests/rustdoc/issue-55001.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust/issues/55001 +#![crate_name="foo"] + // Regression test for issue #55001. Previously, we would incorrectly // cache certain trait selection results when checking for blanket impls, // resulting in an ICE when we tried to confirm the cached ParamCandidate diff --git a/tests/rustdoc/issue-55321.rs b/tests/rustdoc/issue-55321.rs index d3c2070d915d6..e9be1ff854e0f 100644 --- a/tests/rustdoc/issue-55321.rs +++ b/tests/rustdoc/issue-55321.rs @@ -1,6 +1,9 @@ +// https://github.com/rust-lang/rust/issues/55321 +#![crate_name="foo"] + #![feature(negative_impls)] -// @has issue_55321/struct.A.html +// @has foo/struct.A.html // @has - '//*[@id="trait-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \ // "impl !Send for A" // @has - '//*[@id="trait-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \ @@ -10,7 +13,7 @@ pub struct A(); impl !Send for A {} impl !Sync for A {} -// @has issue_55321/struct.B.html +// @has foo/struct.B.html // @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \ // "impl !Send for B" // @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \ diff --git a/tests/rustdoc/issue-55364.rs b/tests/rustdoc/issue-55364.rs index 941cb3ce1ca5b..c07aba628c90d 100644 --- a/tests/rustdoc/issue-55364.rs +++ b/tests/rustdoc/issue-55364.rs @@ -1,6 +1,9 @@ +// https://github.com/rust-lang/rust/issues/55364 +#![crate_name="foo"] + // First a module with inner documentation -// @has issue_55364/subone/index.html +// @has foo/subone/index.html // These foo/bar links in the module's documentation should refer inside `subone` // @has - '//section[@id="main-content"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' // @has - '//section[@id="main-content"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' @@ -8,12 +11,12 @@ pub mod subone { //! See either [foo] or [bar]. // This should refer to subone's `bar` - // @has issue_55364/subone/fn.foo.html + // @has foo/subone/fn.foo.html // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' /// See [bar] pub fn foo() {} // This should refer to subone's `foo` - // @has issue_55364/subone/fn.bar.html + // @has foo/subone/fn.bar.html // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' /// See [foo] pub fn bar() {} @@ -21,7 +24,7 @@ pub mod subone { // A module with outer documentation -// @has issue_55364/subtwo/index.html +// @has foo/subtwo/index.html // These foo/bar links in the module's documentation should not reference inside `subtwo` // @!has - '//section[@id="main-content"]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' // @!has - '//section[@id="main-content"]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' @@ -36,13 +39,13 @@ pub mod subtwo { // Despite the module's docs referring to the top level foo/bar, // this should refer to subtwo's `bar` - // @has issue_55364/subtwo/fn.foo.html + // @has foo/subtwo/fn.foo.html // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' /// See [bar] pub fn foo() {} // Despite the module's docs referring to the top level foo/bar, // this should refer to subtwo's `foo` - // @has issue_55364/subtwo/fn.bar.html + // @has foo/subtwo/fn.bar.html // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' /// See [foo] pub fn bar() {} @@ -57,7 +60,7 @@ pub fn bar() {} // This module refers to the outer foo/bar by means of `super::` -// @has issue_55364/subthree/index.html +// @has foo/subthree/index.html // This module should also refer to the top level foo/bar // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.foo.html"]' 'foo' // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.bar.html"]' 'bar' @@ -67,7 +70,7 @@ pub mod subthree { // Next we go *deeper* - In order to ensure it's not just "this or parent" // we test `crate::` and a `super::super::...` chain -// @has issue_55364/subfour/subfive/subsix/subseven/subeight/index.html +// @has foo/subfour/subfive/subsix/subseven/subeight/index.html // @has - '//section[@id="main-content"]/ul[@class="item-table"]//div[@class="desc docblock-short"]//a[@href="../../../../../subone/fn.foo.html"]' 'other foo' // @has - '//section[@id="main-content"]/ul[@class="item-table"]//div[@class="desc docblock-short"]//a[@href="../../../../../subtwo/fn.bar.html"]' 'other bar' pub mod subfour { From 35830fe218f245ef4a82199b8ee371fa89a52721 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Wed, 3 Jan 2024 15:30:09 -0700 Subject: [PATCH 2/5] rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 5) --- .../issue-52873.rs => rustdoc-ui/ice-blanket-impl-52873.rs} | 0 .../ice-blanket-impl-selection-55001.rs} | 0 ...sue-50159.rs => auto-trait-bounds-by-associated-type-50159.rs} | 0 ...ue-54705.rs => auto-trait-bounds-inference-variables-54705.rs} | 0 .../rustdoc/{issue-51236.rs => auto-trait-bounds-where-51236.rs} | 0 .../rustdoc/{issue-55321.rs => auto-trait-negative-impl-55321.rs} | 0 ...lank-line-in-doc-block.rs => blank-line-in-doc-block-47197.rs} | 0 .../{issue-54478-demo-allocator.rs => demo-allocator-54478.rs} | 0 tests/rustdoc/{issue-35169-2.rs => deref-mut-35169-2.rs} | 0 tests/rustdoc/{issue-35169.rs => deref-mut-35169.rs} | 0 tests/rustdoc/{issue-42760.rs => doc-attr-comment-mix-42760.rs} | 0 .../doctest-escape-boring-41783.codeblock.html} | 0 .../{issue-41783.rs => doctest/doctest-escape-boring-41783.rs} | 0 tests/rustdoc/{issue-35488.rs => enum-variant-reexport-35488.rs} | 0 tests/rustdoc/{issue-53689.rs => impl-blanket-53689.rs} | 0 tests/rustdoc/{issue-43869.rs => impl-trait-43869.rs} | 0 tests/rustdoc/{ => inline_cross}/auxiliary/issue-46727.rs | 0 .../rustdoc/{issue-46727.rs => inline_cross/const-eval-46727.rs} | 0 .../module-scope-name-resolution-55364.rs} | 0 ...-46380-2.rs => public-impl-mention-private-generic-46380-2.rs} | 0 tests/rustdoc/{issue-53812.rs => sort-53812.rs} | 0 tests/rustdoc/{issue-46377.rs => summary-header-46377.rs} | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename tests/{rustdoc/issue-52873.rs => rustdoc-ui/ice-blanket-impl-52873.rs} (100%) rename tests/{rustdoc/issue-55001.rs => rustdoc-ui/ice-blanket-impl-selection-55001.rs} (100%) rename tests/rustdoc/{issue-50159.rs => auto-trait-bounds-by-associated-type-50159.rs} (100%) rename tests/rustdoc/{issue-54705.rs => auto-trait-bounds-inference-variables-54705.rs} (100%) rename tests/rustdoc/{issue-51236.rs => auto-trait-bounds-where-51236.rs} (100%) rename tests/rustdoc/{issue-55321.rs => auto-trait-negative-impl-55321.rs} (100%) rename tests/rustdoc/{issue-47197-blank-line-in-doc-block.rs => blank-line-in-doc-block-47197.rs} (100%) rename tests/rustdoc/{issue-54478-demo-allocator.rs => demo-allocator-54478.rs} (100%) rename tests/rustdoc/{issue-35169-2.rs => deref-mut-35169-2.rs} (100%) rename tests/rustdoc/{issue-35169.rs => deref-mut-35169.rs} (100%) rename tests/rustdoc/{issue-42760.rs => doc-attr-comment-mix-42760.rs} (100%) rename tests/rustdoc/{issue-41783.codeblock.html => doctest/doctest-escape-boring-41783.codeblock.html} (100%) rename tests/rustdoc/{issue-41783.rs => doctest/doctest-escape-boring-41783.rs} (100%) rename tests/rustdoc/{issue-35488.rs => enum-variant-reexport-35488.rs} (100%) rename tests/rustdoc/{issue-53689.rs => impl-blanket-53689.rs} (100%) rename tests/rustdoc/{issue-43869.rs => impl-trait-43869.rs} (100%) rename tests/rustdoc/{ => inline_cross}/auxiliary/issue-46727.rs (100%) rename tests/rustdoc/{issue-46727.rs => inline_cross/const-eval-46727.rs} (100%) rename tests/rustdoc/{issue-55364.rs => intra-doc/module-scope-name-resolution-55364.rs} (100%) rename tests/rustdoc/{issue-46380-2.rs => public-impl-mention-private-generic-46380-2.rs} (100%) rename tests/rustdoc/{issue-53812.rs => sort-53812.rs} (100%) rename tests/rustdoc/{issue-46377.rs => summary-header-46377.rs} (100%) diff --git a/tests/rustdoc/issue-52873.rs b/tests/rustdoc-ui/ice-blanket-impl-52873.rs similarity index 100% rename from tests/rustdoc/issue-52873.rs rename to tests/rustdoc-ui/ice-blanket-impl-52873.rs diff --git a/tests/rustdoc/issue-55001.rs b/tests/rustdoc-ui/ice-blanket-impl-selection-55001.rs similarity index 100% rename from tests/rustdoc/issue-55001.rs rename to tests/rustdoc-ui/ice-blanket-impl-selection-55001.rs diff --git a/tests/rustdoc/issue-50159.rs b/tests/rustdoc/auto-trait-bounds-by-associated-type-50159.rs similarity index 100% rename from tests/rustdoc/issue-50159.rs rename to tests/rustdoc/auto-trait-bounds-by-associated-type-50159.rs diff --git a/tests/rustdoc/issue-54705.rs b/tests/rustdoc/auto-trait-bounds-inference-variables-54705.rs similarity index 100% rename from tests/rustdoc/issue-54705.rs rename to tests/rustdoc/auto-trait-bounds-inference-variables-54705.rs diff --git a/tests/rustdoc/issue-51236.rs b/tests/rustdoc/auto-trait-bounds-where-51236.rs similarity index 100% rename from tests/rustdoc/issue-51236.rs rename to tests/rustdoc/auto-trait-bounds-where-51236.rs diff --git a/tests/rustdoc/issue-55321.rs b/tests/rustdoc/auto-trait-negative-impl-55321.rs similarity index 100% rename from tests/rustdoc/issue-55321.rs rename to tests/rustdoc/auto-trait-negative-impl-55321.rs diff --git a/tests/rustdoc/issue-47197-blank-line-in-doc-block.rs b/tests/rustdoc/blank-line-in-doc-block-47197.rs similarity index 100% rename from tests/rustdoc/issue-47197-blank-line-in-doc-block.rs rename to tests/rustdoc/blank-line-in-doc-block-47197.rs diff --git a/tests/rustdoc/issue-54478-demo-allocator.rs b/tests/rustdoc/demo-allocator-54478.rs similarity index 100% rename from tests/rustdoc/issue-54478-demo-allocator.rs rename to tests/rustdoc/demo-allocator-54478.rs diff --git a/tests/rustdoc/issue-35169-2.rs b/tests/rustdoc/deref-mut-35169-2.rs similarity index 100% rename from tests/rustdoc/issue-35169-2.rs rename to tests/rustdoc/deref-mut-35169-2.rs diff --git a/tests/rustdoc/issue-35169.rs b/tests/rustdoc/deref-mut-35169.rs similarity index 100% rename from tests/rustdoc/issue-35169.rs rename to tests/rustdoc/deref-mut-35169.rs diff --git a/tests/rustdoc/issue-42760.rs b/tests/rustdoc/doc-attr-comment-mix-42760.rs similarity index 100% rename from tests/rustdoc/issue-42760.rs rename to tests/rustdoc/doc-attr-comment-mix-42760.rs diff --git a/tests/rustdoc/issue-41783.codeblock.html b/tests/rustdoc/doctest/doctest-escape-boring-41783.codeblock.html similarity index 100% rename from tests/rustdoc/issue-41783.codeblock.html rename to tests/rustdoc/doctest/doctest-escape-boring-41783.codeblock.html diff --git a/tests/rustdoc/issue-41783.rs b/tests/rustdoc/doctest/doctest-escape-boring-41783.rs similarity index 100% rename from tests/rustdoc/issue-41783.rs rename to tests/rustdoc/doctest/doctest-escape-boring-41783.rs diff --git a/tests/rustdoc/issue-35488.rs b/tests/rustdoc/enum-variant-reexport-35488.rs similarity index 100% rename from tests/rustdoc/issue-35488.rs rename to tests/rustdoc/enum-variant-reexport-35488.rs diff --git a/tests/rustdoc/issue-53689.rs b/tests/rustdoc/impl-blanket-53689.rs similarity index 100% rename from tests/rustdoc/issue-53689.rs rename to tests/rustdoc/impl-blanket-53689.rs diff --git a/tests/rustdoc/issue-43869.rs b/tests/rustdoc/impl-trait-43869.rs similarity index 100% rename from tests/rustdoc/issue-43869.rs rename to tests/rustdoc/impl-trait-43869.rs diff --git a/tests/rustdoc/auxiliary/issue-46727.rs b/tests/rustdoc/inline_cross/auxiliary/issue-46727.rs similarity index 100% rename from tests/rustdoc/auxiliary/issue-46727.rs rename to tests/rustdoc/inline_cross/auxiliary/issue-46727.rs diff --git a/tests/rustdoc/issue-46727.rs b/tests/rustdoc/inline_cross/const-eval-46727.rs similarity index 100% rename from tests/rustdoc/issue-46727.rs rename to tests/rustdoc/inline_cross/const-eval-46727.rs diff --git a/tests/rustdoc/issue-55364.rs b/tests/rustdoc/intra-doc/module-scope-name-resolution-55364.rs similarity index 100% rename from tests/rustdoc/issue-55364.rs rename to tests/rustdoc/intra-doc/module-scope-name-resolution-55364.rs diff --git a/tests/rustdoc/issue-46380-2.rs b/tests/rustdoc/public-impl-mention-private-generic-46380-2.rs similarity index 100% rename from tests/rustdoc/issue-46380-2.rs rename to tests/rustdoc/public-impl-mention-private-generic-46380-2.rs diff --git a/tests/rustdoc/issue-53812.rs b/tests/rustdoc/sort-53812.rs similarity index 100% rename from tests/rustdoc/issue-53812.rs rename to tests/rustdoc/sort-53812.rs diff --git a/tests/rustdoc/issue-46377.rs b/tests/rustdoc/summary-header-46377.rs similarity index 100% rename from tests/rustdoc/issue-46377.rs rename to tests/rustdoc/summary-header-46377.rs From a704e21c3f2ee1c9215bd088d2880c8e396eacca Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Wed, 3 Jan 2024 15:30:46 -0700 Subject: [PATCH 3/5] Add `check-pass` to ice tests --- tests/rustdoc-ui/ice-blanket-impl-52873.rs | 1 + tests/rustdoc-ui/ice-blanket-impl-selection-55001.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/rustdoc-ui/ice-blanket-impl-52873.rs b/tests/rustdoc-ui/ice-blanket-impl-52873.rs index 12d3e3d7f944c..2520957bd005d 100644 --- a/tests/rustdoc-ui/ice-blanket-impl-52873.rs +++ b/tests/rustdoc-ui/ice-blanket-impl-52873.rs @@ -1,3 +1,4 @@ +// check-pass // https://github.com/rust-lang/rust/issues/52873 #![crate_name="foo"] diff --git a/tests/rustdoc-ui/ice-blanket-impl-selection-55001.rs b/tests/rustdoc-ui/ice-blanket-impl-selection-55001.rs index b7d86a1c843bd..babcb3dda1434 100644 --- a/tests/rustdoc-ui/ice-blanket-impl-selection-55001.rs +++ b/tests/rustdoc-ui/ice-blanket-impl-selection-55001.rs @@ -1,3 +1,4 @@ +// check-pass // https://github.com/rust-lang/rust/issues/55001 #![crate_name="foo"] From 7a7bb3ef85ca2f827c39db9fd1594db5162cea13 Mon Sep 17 00:00:00 2001 From: Andrea Ciliberti Date: Mon, 8 Jan 2024 14:43:31 +0100 Subject: [PATCH 4/5] Backlog for HorizonOS UnixListener --- library/std/src/os/unix/net/listener.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/library/std/src/os/unix/net/listener.rs b/library/std/src/os/unix/net/listener.rs index f6835472e2ca1..8bf1e2dca6f7b 100644 --- a/library/std/src/os/unix/net/listener.rs +++ b/library/std/src/os/unix/net/listener.rs @@ -73,7 +73,12 @@ impl UnixListener { unsafe { let inner = Socket::new_raw(libc::AF_UNIX, libc::SOCK_STREAM)?; let (addr, len) = sockaddr_un(path.as_ref())?; - #[cfg(any(target_os = "windows", target_os = "redox", target_os = "espidf"))] + #[cfg(any( + target_os = "windows", + target_os = "redox", + target_os = "espidf", + target_os = "horizon" + ))] const backlog: libc::c_int = 128; #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] const backlog: libc::c_int = -1; @@ -83,7 +88,8 @@ impl UnixListener { target_os = "linux", target_os = "freebsd", target_os = "openbsd", - target_os = "espidf" + target_os = "espidf", + target_os = "horizon" )))] const backlog: libc::c_int = libc::SOMAXCONN; From c6f83b8ff6b4e0fa98713b720ff48d67efe8d932 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Sun, 14 Jan 2024 12:57:13 +0000 Subject: [PATCH 5/5] Inline 2 functions that appear in dep-graph profiles. --- compiler/rustc_index_macros/src/newtype.rs | 1 + compiler/rustc_query_system/src/dep_graph/serialized.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/compiler/rustc_index_macros/src/newtype.rs b/compiler/rustc_index_macros/src/newtype.rs index df1318c835e2b..ede8416125d6a 100644 --- a/compiler/rustc_index_macros/src/newtype.rs +++ b/compiler/rustc_index_macros/src/newtype.rs @@ -263,6 +263,7 @@ impl Parse for Newtype { impl std::ops::Add for #name { type Output = Self; + #[inline] fn add(self, other: usize) -> Self { Self::from_usize(self.index() + other) } diff --git a/compiler/rustc_query_system/src/dep_graph/serialized.rs b/compiler/rustc_query_system/src/dep_graph/serialized.rs index 504763f6cdb38..f6f6aa07cb3f6 100644 --- a/compiler/rustc_query_system/src/dep_graph/serialized.rs +++ b/compiler/rustc_query_system/src/dep_graph/serialized.rs @@ -169,6 +169,7 @@ impl EdgeHeader { } } +#[inline] fn mask(bits: usize) -> usize { usize::MAX >> ((std::mem::size_of::() * 8) - bits) }