Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
new file mode 100644
index 000000000..1e2662389
--- /dev/null
+++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
@@ -0,0 +1,28 @@
+warning: trait bound String: Copy does not depend on any type or lifetime parameters
+  --> $DIR/trivial-bounds-inconsistent-copy.rs:5:51
+   |
+LL | fn copy_string(t: String) -> String where String: Copy {
+   |                                                   ^^^^
+   |
+   = note: `#[warn(trivial_bounds)]` on by default
+
+warning: trait bound String: Copy does not depend on any type or lifetime parameters
+  --> $DIR/trivial-bounds-inconsistent-copy.rs:12:56
+   |
+LL | fn copy_out_string(t: &String) -> String where String: Copy {
+   |                                                        ^^^^
+
+warning: trait bound String: Copy does not depend on any type or lifetime parameters
+  --> $DIR/trivial-bounds-inconsistent-copy.rs:16:55
+   |
+LL | fn copy_string_with_param<T>(x: String) where String: Copy {
+   |                                                       ^^^^
+
+warning: trait bound for<'b> &'b mut i32: Copy does not depend on any type or lifetime parameters
+  --> $DIR/trivial-bounds-inconsistent-copy.rs:22:76
+   |
+LL | fn copy_mut<'a>(t: &&'a mut i32) -> &'a mut i32 where for<'b> &'b mut i32: Copy {
+   |                                                                            ^^^^
+
+warning: 4 warnings emitted
+