Merging upstream version 1.68.2+dfsg1.

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

13 files changed, 1 insertions, 1 deletions

diff --git a/src/test/ui/consts/const-blocks/const-repeat.rs b/tests/ui/consts/const-blocks/const-repeat.rs
index 65d02317d..65d02317d 100644
--- a/src/test/ui/consts/const-blocks/const-repeat.rs
+++ b/tests/ui/consts/const-blocks/const-repeat.rs
diff --git a/src/test/ui/consts/const-blocks/fn-call-in-const.rs b/tests/ui/consts/const-blocks/fn-call-in-const.rs
index 20496f627..20496f627 100644
--- a/src/test/ui/consts/const-blocks/fn-call-in-const.rs
+++ b/tests/ui/consts/const-blocks/fn-call-in-const.rs
diff --git a/src/test/ui/consts/const-blocks/fn-call-in-non-const.rs b/tests/ui/consts/const-blocks/fn-call-in-non-const.rs
index 18b4dc714..18b4dc714 100644
--- a/src/test/ui/consts/const-blocks/fn-call-in-non-const.rs
+++ b/tests/ui/consts/const-blocks/fn-call-in-non-const.rs
diff --git a/src/test/ui/consts/const-blocks/fn-call-in-non-const.stderr b/tests/ui/consts/const-blocks/fn-call-in-non-const.stderr
index ee352700c..ee352700c 100644
--- a/src/test/ui/consts/const-blocks/fn-call-in-non-const.stderr
+++ b/tests/ui/consts/const-blocks/fn-call-in-non-const.stderr
diff --git a/src/test/ui/consts/const-blocks/migrate-fail.rs b/tests/ui/consts/const-blocks/migrate-fail.rs
index fddbfbb9d..fddbfbb9d 100644
--- a/src/test/ui/consts/const-blocks/migrate-fail.rs
+++ b/tests/ui/consts/const-blocks/migrate-fail.rs
diff --git a/src/test/ui/consts/const-blocks/migrate-fail.stderr b/tests/ui/consts/const-blocks/migrate-fail.stderr
index 928ffd083..928ffd083 100644
--- a/src/test/ui/consts/const-blocks/migrate-fail.stderr
+++ b/tests/ui/consts/const-blocks/migrate-fail.stderr
diff --git a/src/test/ui/consts/const-blocks/migrate-pass.rs b/tests/ui/consts/const-blocks/migrate-pass.rs
index fd66f5aa6..fd66f5aa6 100644
--- a/src/test/ui/consts/const-blocks/migrate-pass.rs
+++ b/tests/ui/consts/const-blocks/migrate-pass.rs
diff --git a/src/test/ui/consts/const-blocks/nll-fail.rs b/tests/ui/consts/const-blocks/nll-fail.rs
index fddbfbb9d..fddbfbb9d 100644
--- a/src/test/ui/consts/const-blocks/nll-fail.rs
+++ b/tests/ui/consts/const-blocks/nll-fail.rs
diff --git a/src/test/ui/consts/const-blocks/nll-fail.stderr b/tests/ui/consts/const-blocks/nll-fail.stderr
index fede00845..fede00845 100644
--- a/src/test/ui/consts/const-blocks/nll-fail.stderr
+++ b/tests/ui/consts/const-blocks/nll-fail.stderr
diff --git a/src/test/ui/consts/const-blocks/nll-pass.rs b/tests/ui/consts/const-blocks/nll-pass.rs
index fd66f5aa6..fd66f5aa6 100644
--- a/src/test/ui/consts/const-blocks/nll-pass.rs
+++ b/tests/ui/consts/const-blocks/nll-pass.rs
diff --git a/src/test/ui/consts/const-blocks/run-pass.rs b/tests/ui/consts/const-blocks/run-pass.rs
index e11f69bab..e11f69bab 100644
--- a/src/test/ui/consts/const-blocks/run-pass.rs
+++ b/tests/ui/consts/const-blocks/run-pass.rs
diff --git a/src/test/ui/consts/const-blocks/trait-error.rs b/tests/ui/consts/const-blocks/trait-error.rs
index 49d1e9b94..49d1e9b94 100644
--- a/src/test/ui/consts/const-blocks/trait-error.rs
+++ b/tests/ui/consts/const-blocks/trait-error.rs
diff --git a/src/test/ui/consts/const-blocks/trait-error.stderr b/tests/ui/consts/const-blocks/trait-error.stderr
index b11dd4b80..06fa4b0b1 100644
--- a/src/test/ui/consts/const-blocks/trait-error.stderr
+++ b/tests/ui/consts/const-blocks/trait-error.stderr
@@ -8,7 +8,7 @@ note: required for `Foo<String>` to implement `Copy`
   --> $DIR/trait-error.rs:1:10
    |
 LL | #[derive(Copy, Clone)]
-   |          ^^^^
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
    = note: the `Copy` trait is required because this value will be copied for each element of the array
    = help: consider creating a new `const` item and initializing it with the result of the function call to be used in the repeat position, like `const VAL: Type = const_fn();` and `let x = [VAL; 42];`
    = help: create an inline `const` block, see RFC #2920 <https://github.com/rust-lang/rfcs/pull/2920> for more information