From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- .../trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr | 2 +- tests/ui/trivial-bounds/trivial-bounds-leak-copy.stderr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/ui/trivial-bounds') diff --git a/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr index 26679e713..554b3a64c 100644 --- a/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr +++ b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr @@ -12,6 +12,6 @@ help: you can convert an `i32` to a `u8` and panic if the converted value doesn' LL | B::get_x().try_into().unwrap() | ++++++++++++++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/trivial-bounds/trivial-bounds-leak-copy.stderr b/tests/ui/trivial-bounds/trivial-bounds-leak-copy.stderr index b3ec3cd8d..e48d48a72 100644 --- a/tests/ui/trivial-bounds/trivial-bounds-leak-copy.stderr +++ b/tests/ui/trivial-bounds/trivial-bounds-leak-copy.stderr @@ -4,6 +4,6 @@ error[E0507]: cannot move out of `*t` which is behind a shared reference LL | *t | ^^ move occurs because `*t` has type `String`, which does not implement the `Copy` trait -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0507`. -- cgit v1.2.3