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 --- tests/ui/mut/mut-cant-alias.stderr | 2 +- tests/ui/mut/mut-cross-borrowing.stderr | 2 +- tests/ui/mut/mut-ref.stderr | 2 +- tests/ui/mut/mutable-class-fields-2.stderr | 2 +- tests/ui/mut/mutable-class-fields.stderr | 2 +- tests/ui/mut/mutable-enum-indirect.stderr | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/ui/mut') diff --git a/tests/ui/mut/mut-cant-alias.stderr b/tests/ui/mut/mut-cant-alias.stderr index d56e45db1..4106ebdd1 100644 --- a/tests/ui/mut/mut-cant-alias.stderr +++ b/tests/ui/mut/mut-cant-alias.stderr @@ -8,6 +8,6 @@ LL | let b2 = &mut *b; LL | b1.use_mut(); | -- first borrow later used here -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0499`. diff --git a/tests/ui/mut/mut-cross-borrowing.stderr b/tests/ui/mut/mut-cross-borrowing.stderr index 8a3076db9..4cfe56bfa 100644 --- a/tests/ui/mut/mut-cross-borrowing.stderr +++ b/tests/ui/mut/mut-cross-borrowing.stderr @@ -18,6 +18,6 @@ help: consider mutably borrowing here LL | f(&mut x) | ++++ -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/mut/mut-ref.stderr b/tests/ui/mut/mut-ref.stderr index e6d4901aa..b91392f22 100644 --- a/tests/ui/mut/mut-ref.stderr +++ b/tests/ui/mut/mut-ref.stderr @@ -4,5 +4,5 @@ error: the order of `mut` and `ref` is incorrect LL | let mut ref x = 10; | ^^^^^^^ help: try switching the order: `ref mut` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/mut/mutable-class-fields-2.stderr b/tests/ui/mut/mutable-class-fields-2.stderr index c53c6ea30..eb0c54f88 100644 --- a/tests/ui/mut/mutable-class-fields-2.stderr +++ b/tests/ui/mut/mutable-class-fields-2.stderr @@ -9,6 +9,6 @@ help: consider changing this to be a mutable reference LL | pub fn eat(&mut self) { | ~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0594`. diff --git a/tests/ui/mut/mutable-class-fields.stderr b/tests/ui/mut/mutable-class-fields.stderr index 1d731be8a..e57cce62e 100644 --- a/tests/ui/mut/mutable-class-fields.stderr +++ b/tests/ui/mut/mutable-class-fields.stderr @@ -9,6 +9,6 @@ help: consider changing this to be mutable LL | let mut nyan : Cat = cat(52, 99); | +++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0594`. diff --git a/tests/ui/mut/mutable-enum-indirect.stderr b/tests/ui/mut/mutable-enum-indirect.stderr index 9e1f4e1fe..0b7783b33 100644 --- a/tests/ui/mut/mutable-enum-indirect.stderr +++ b/tests/ui/mut/mutable-enum-indirect.stderr @@ -19,6 +19,6 @@ note: required by a bound in `bar` LL | fn bar(_: T) {} | ^^^^ required by this bound in `bar` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. -- cgit v1.2.3