Merging upstream version 1.75.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 48 insertions, 38 deletions

diff --git a/tests/rustdoc/auxiliary/async-trait-dep.rs b/tests/rustdoc/auxiliary/async-trait-dep.rs
index 10a55dd02..d455ee99e 100644
--- a/tests/rustdoc/auxiliary/async-trait-dep.rs
+++ b/tests/rustdoc/auxiliary/async-trait-dep.rs
@@ -1,6 +1,5 @@
 // edition:2021
 
-#![feature(async_fn_in_trait)]
 #![allow(incomplete_features)]
 
 pub trait Meow {
diff --git a/tests/rustdoc/auxiliary/enum-variant.rs b/tests/rustdoc/auxiliary/enum-variant.rs
new file mode 100644
index 000000000..a0a7fd894
--- /dev/null
+++ b/tests/rustdoc/auxiliary/enum-variant.rs
@@ -0,0 +1,48 @@
+#![crate_name = "bar"]
+
+pub enum E {
+    A = 12,
+    B,
+    C = 1245,
+}
+
+pub enum F {
+    A,
+    B,
+}
+
+#[repr(u32)]
+pub enum G {
+    A = 12,
+    B,
+    C(u32),
+}
+
+pub enum H {
+    A,
+    C(u32),
+}
+
+#[repr(C)]
+pub enum N {
+    A,
+    B,
+}
+
+#[repr(C)]
+pub enum O {
+    A(u32),
+    B,
+}
+
+#[repr(u32)]
+pub enum P {
+    A,
+    B,
+}
+
+#[repr(u32)]
+pub enum Q {
+    A(u32),
+    B,
+}
diff --git a/tests/rustdoc/auxiliary/issue-21801.rs b/tests/rustdoc/auxiliary/issue-21801.rs
deleted file mode 100644
index 732612ff0..000000000
--- a/tests/rustdoc/auxiliary/issue-21801.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: -Cmetadata=aux
-
-pub struct Foo;
-
-impl Foo {
-    pub fn new<F>(f: F) -> Foo where F: FnMut() -> i32 {
-        loop {}
-    }
-}
diff --git a/tests/rustdoc/auxiliary/issue-23207-1.rs b/tests/rustdoc/auxiliary/issue-23207-1.rs
deleted file mode 100644
index 8531d5f1a..000000000
--- a/tests/rustdoc/auxiliary/issue-23207-1.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod fmt {
-    pub struct Error;
-}
diff --git a/tests/rustdoc/auxiliary/issue-23207-2.rs b/tests/rustdoc/auxiliary/issue-23207-2.rs
deleted file mode 100644
index b92b16653..000000000
--- a/tests/rustdoc/auxiliary/issue-23207-2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate issue_23207_1;
-
-pub mod fmt {
-    pub use issue_23207_1::fmt::Error;
-}
diff --git a/tests/rustdoc/auxiliary/issue-27362-aux.rs b/tests/rustdoc/auxiliary/issue-27362-aux.rs
deleted file mode 100644
index 077bdc33e..000000000
--- a/tests/rustdoc/auxiliary/issue-27362-aux.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// compile-flags: -Cmetadata=aux
-
-pub const fn foo() {}
-pub const unsafe fn bar() {}
-
-pub struct Foo;
-
-impl Foo {
-    pub const unsafe fn baz() {}
-}
diff --git a/tests/rustdoc/auxiliary/issue-29584.rs b/tests/rustdoc/auxiliary/issue-29584.rs
deleted file mode 100644
index a9b8796c0..000000000
--- a/tests/rustdoc/auxiliary/issue-29584.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// compile-flags: -Cmetadata=aux
-
-pub struct Foo;
-
-#[doc(hidden)]
-mod bar {
-    trait Bar {}
-
-    impl Bar for ::Foo {}
-}