Merging upstream version 1.68.2+dfsg1.

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

18 files changed, 0 insertions, 6 deletions

diff --git a/src/test/ui/malformed/issue-69341-malformed-derive-inert.rs b/tests/ui/malformed/issue-69341-malformed-derive-inert.rs
index fc4c3f4e6..fc4c3f4e6 100644
--- a/src/test/ui/malformed/issue-69341-malformed-derive-inert.rs
+++ b/tests/ui/malformed/issue-69341-malformed-derive-inert.rs
diff --git a/src/test/ui/malformed/issue-69341-malformed-derive-inert.stderr b/tests/ui/malformed/issue-69341-malformed-derive-inert.stderr
index 04f7ebe01..04f7ebe01 100644
--- a/src/test/ui/malformed/issue-69341-malformed-derive-inert.stderr
+++ b/tests/ui/malformed/issue-69341-malformed-derive-inert.stderr
diff --git a/src/test/ui/malformed/malformed-derive-entry.rs b/tests/ui/malformed/malformed-derive-entry.rs
index 77fa2f566..77fa2f566 100644
--- a/src/test/ui/malformed/malformed-derive-entry.rs
+++ b/tests/ui/malformed/malformed-derive-entry.rs
diff --git a/src/test/ui/malformed/malformed-derive-entry.stderr b/tests/ui/malformed/malformed-derive-entry.stderr
index 803883460..6ff6fbabb 100644
--- a/src/test/ui/malformed/malformed-derive-entry.stderr
+++ b/tests/ui/malformed/malformed-derive-entry.stderr
@@ -24,9 +24,6 @@ LL | #[derive(Copy(Bad))]
    |
 note: required by a bound in `Copy`
   --> $SRC_DIR/core/src/marker.rs:LL:COL
-   |
-LL | pub trait Copy: Clone {
-   |                 ^^^^^ required by this bound in `Copy`
    = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Test1` with `#[derive(Clone)]`
    |
@@ -41,9 +38,6 @@ LL | #[derive(Copy="bad")]
    |
 note: required by a bound in `Copy`
   --> $SRC_DIR/core/src/marker.rs:LL:COL
-   |
-LL | pub trait Copy: Clone {
-   |                 ^^^^^ required by this bound in `Copy`
    = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Test2` with `#[derive(Clone)]`
    |
diff --git a/src/test/ui/malformed/malformed-interpolated.rs b/tests/ui/malformed/malformed-interpolated.rs
index 0d84e723f..0d84e723f 100644
--- a/src/test/ui/malformed/malformed-interpolated.rs
+++ b/tests/ui/malformed/malformed-interpolated.rs
diff --git a/src/test/ui/malformed/malformed-interpolated.stderr b/tests/ui/malformed/malformed-interpolated.stderr
index c24d9f153..c24d9f153 100644
--- a/src/test/ui/malformed/malformed-interpolated.stderr
+++ b/tests/ui/malformed/malformed-interpolated.stderr
diff --git a/src/test/ui/malformed/malformed-meta-delim.rs b/tests/ui/malformed/malformed-meta-delim.rs
index 5b1614b69..5b1614b69 100644
--- a/src/test/ui/malformed/malformed-meta-delim.rs
+++ b/tests/ui/malformed/malformed-meta-delim.rs
diff --git a/src/test/ui/malformed/malformed-meta-delim.stderr b/tests/ui/malformed/malformed-meta-delim.stderr
index 27636c3d5..27636c3d5 100644
--- a/src/test/ui/malformed/malformed-meta-delim.stderr
+++ b/tests/ui/malformed/malformed-meta-delim.stderr
diff --git a/src/test/ui/malformed/malformed-plugin-1.rs b/tests/ui/malformed/malformed-plugin-1.rs
index d4c1a2a16..d4c1a2a16 100644
--- a/src/test/ui/malformed/malformed-plugin-1.rs
+++ b/tests/ui/malformed/malformed-plugin-1.rs
diff --git a/src/test/ui/malformed/malformed-plugin-1.stderr b/tests/ui/malformed/malformed-plugin-1.stderr
index 505f6b6f1..505f6b6f1 100644
--- a/src/test/ui/malformed/malformed-plugin-1.stderr
+++ b/tests/ui/malformed/malformed-plugin-1.stderr
diff --git a/src/test/ui/malformed/malformed-plugin-2.rs b/tests/ui/malformed/malformed-plugin-2.rs
index ba80d97a3..ba80d97a3 100644
--- a/src/test/ui/malformed/malformed-plugin-2.rs
+++ b/tests/ui/malformed/malformed-plugin-2.rs
diff --git a/src/test/ui/malformed/malformed-plugin-2.stderr b/tests/ui/malformed/malformed-plugin-2.stderr
index 52bbd82a3..52bbd82a3 100644
--- a/src/test/ui/malformed/malformed-plugin-2.stderr
+++ b/tests/ui/malformed/malformed-plugin-2.stderr
diff --git a/src/test/ui/malformed/malformed-plugin-3.rs b/tests/ui/malformed/malformed-plugin-3.rs
index d2bd8f9f8..d2bd8f9f8 100644
--- a/src/test/ui/malformed/malformed-plugin-3.rs
+++ b/tests/ui/malformed/malformed-plugin-3.rs
diff --git a/src/test/ui/malformed/malformed-plugin-3.stderr b/tests/ui/malformed/malformed-plugin-3.stderr
index 64cb429ea..64cb429ea 100644
--- a/src/test/ui/malformed/malformed-plugin-3.stderr
+++ b/tests/ui/malformed/malformed-plugin-3.stderr
diff --git a/src/test/ui/malformed/malformed-regressions.rs b/tests/ui/malformed/malformed-regressions.rs
index ac1444bba..ac1444bba 100644
--- a/src/test/ui/malformed/malformed-regressions.rs
+++ b/tests/ui/malformed/malformed-regressions.rs
diff --git a/src/test/ui/malformed/malformed-regressions.stderr b/tests/ui/malformed/malformed-regressions.stderr
index 9bfbe7eba..9bfbe7eba 100644
--- a/src/test/ui/malformed/malformed-regressions.stderr
+++ b/tests/ui/malformed/malformed-regressions.stderr
diff --git a/src/test/ui/malformed/malformed-special-attrs.rs b/tests/ui/malformed/malformed-special-attrs.rs
index 05b7ebe46..05b7ebe46 100644
--- a/src/test/ui/malformed/malformed-special-attrs.rs
+++ b/tests/ui/malformed/malformed-special-attrs.rs
diff --git a/src/test/ui/malformed/malformed-special-attrs.stderr b/tests/ui/malformed/malformed-special-attrs.stderr
index 1764c3969..1764c3969 100644
--- a/src/test/ui/malformed/malformed-special-attrs.stderr
+++ b/tests/ui/malformed/malformed-special-attrs.stderr