From 018c4950b9406055dec02ef0fb52f132e2bb1e2c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:25:56 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- .../liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr | 2 +- .../liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr | 2 +- .../liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr | 2 +- .../liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr | 2 +- tests/ui/liveness/liveness-closure-require-ret.stderr | 2 +- tests/ui/liveness/liveness-forgot-ret.stderr | 2 +- tests/ui/liveness/liveness-issue-2163.stderr | 2 +- tests/ui/liveness/liveness-missing-ret2.stderr | 2 +- tests/ui/liveness/liveness-move-call-arg-2.stderr | 2 +- tests/ui/liveness/liveness-move-call-arg.stderr | 2 +- tests/ui/liveness/liveness-move-in-loop.stderr | 2 +- tests/ui/liveness/liveness-move-in-while.stderr | 2 +- tests/ui/liveness/liveness-use-after-move.stderr | 2 +- tests/ui/liveness/liveness-use-after-send.stderr | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/ui/liveness') diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr index 66cdce7da..f0174560f 100644 --- a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr +++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr @@ -7,6 +7,6 @@ LL | let v: isize; LL | v = 1; | ^^^^^ cannot assign twice to immutable variable -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0384`. diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr index 5db9539cb..578a40e40 100644 --- a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr +++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr @@ -9,6 +9,6 @@ LL | v = 2; LL | v += 1; | ^^^^^^ cannot assign twice to immutable variable -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0384`. diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr index bb7e7e27a..2f55b50f0 100644 --- a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr +++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr @@ -10,6 +10,6 @@ LL | let b = Box::new(1); LL | b = Box::new(2); | ^ cannot assign twice to immutable variable -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0384`. diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr index 80458a70a..8eb71cd99 100644 --- a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr +++ b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr @@ -10,6 +10,6 @@ LL | let v: isize = 1; LL | v = 2; | ^^^^^ cannot assign twice to immutable variable -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0384`. diff --git a/tests/ui/liveness/liveness-closure-require-ret.stderr b/tests/ui/liveness/liveness-closure-require-ret.stderr index 07b2ef6cd..b5d48f498 100644 --- a/tests/ui/liveness/liveness-closure-require-ret.stderr +++ b/tests/ui/liveness/liveness-closure-require-ret.stderr @@ -4,6 +4,6 @@ error[E0308]: mismatched types LL | fn main() { println!("{}", force(|| {})); } | ^^ expected `isize`, found `()` -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/liveness/liveness-forgot-ret.stderr b/tests/ui/liveness/liveness-forgot-ret.stderr index ddbdbdb0f..a5adadca2 100644 --- a/tests/ui/liveness/liveness-forgot-ret.stderr +++ b/tests/ui/liveness/liveness-forgot-ret.stderr @@ -11,6 +11,6 @@ help: consider returning the local binding `a` LL | fn f(a: isize) -> isize { if god_exists(a) { return 5; }; a } | + -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/liveness/liveness-issue-2163.stderr b/tests/ui/liveness/liveness-issue-2163.stderr index 2adc2d438..216469bf6 100644 --- a/tests/ui/liveness/liveness-issue-2163.stderr +++ b/tests/ui/liveness/liveness-issue-2163.stderr @@ -7,6 +7,6 @@ LL | | LL | | }); | |_____^ expected `bool`, found `()` -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/liveness/liveness-missing-ret2.stderr b/tests/ui/liveness/liveness-missing-ret2.stderr index afdb733cd..8fe999e02 100644 --- a/tests/ui/liveness/liveness-missing-ret2.stderr +++ b/tests/ui/liveness/liveness-missing-ret2.stderr @@ -6,6 +6,6 @@ LL | fn f() -> isize { | | | implicitly returns `()` as its body has no tail or `return` expression -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/liveness/liveness-move-call-arg-2.stderr b/tests/ui/liveness/liveness-move-call-arg-2.stderr index 479a086a8..f4252e1ac 100644 --- a/tests/ui/liveness/liveness-move-call-arg-2.stderr +++ b/tests/ui/liveness/liveness-move-call-arg-2.stderr @@ -21,6 +21,6 @@ help: consider cloning the value if the performance cost is acceptable LL | take(x.clone()); | ++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0382`. diff --git a/tests/ui/liveness/liveness-move-call-arg.stderr b/tests/ui/liveness/liveness-move-call-arg.stderr index d14cd6cb4..9697ed5cb 100644 --- a/tests/ui/liveness/liveness-move-call-arg.stderr +++ b/tests/ui/liveness/liveness-move-call-arg.stderr @@ -21,6 +21,6 @@ help: consider cloning the value if the performance cost is acceptable LL | take(x.clone()); | ++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0382`. diff --git a/tests/ui/liveness/liveness-move-in-loop.stderr b/tests/ui/liveness/liveness-move-in-loop.stderr index a060914f1..7180eb23b 100644 --- a/tests/ui/liveness/liveness-move-in-loop.stderr +++ b/tests/ui/liveness/liveness-move-in-loop.stderr @@ -21,6 +21,6 @@ help: consider cloning the value if the performance cost is acceptable LL | x = y.clone(); | ++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0382`. diff --git a/tests/ui/liveness/liveness-move-in-while.stderr b/tests/ui/liveness/liveness-move-in-while.stderr index 4dff7447d..dc48c4cc9 100644 --- a/tests/ui/liveness/liveness-move-in-while.stderr +++ b/tests/ui/liveness/liveness-move-in-while.stderr @@ -41,6 +41,6 @@ help: consider cloning the value if the performance cost is acceptable LL | while true { while true { while true { x = y.clone(); x.clone(); } } } | ++++++++ -error: aborting due to previous error; 3 warnings emitted +error: aborting due to 1 previous error; 3 warnings emitted For more information about this error, try `rustc --explain E0382`. diff --git a/tests/ui/liveness/liveness-use-after-move.stderr b/tests/ui/liveness/liveness-use-after-move.stderr index 3accba197..eab51edca 100644 --- a/tests/ui/liveness/liveness-use-after-move.stderr +++ b/tests/ui/liveness/liveness-use-after-move.stderr @@ -15,6 +15,6 @@ help: consider cloning the value if the performance cost is acceptable LL | let y = x.clone(); | ++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0382`. diff --git a/tests/ui/liveness/liveness-use-after-send.stderr b/tests/ui/liveness/liveness-use-after-send.stderr index 65d55ca8f..2323451a7 100644 --- a/tests/ui/liveness/liveness-use-after-send.stderr +++ b/tests/ui/liveness/liveness-use-after-send.stderr @@ -19,6 +19,6 @@ help: consider cloning the value if the performance cost is acceptable LL | send(ch, message.clone()); | ++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0382`. -- cgit v1.2.3