diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:25:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:25:56 +0000 |
| commit | 018c4950b9406055dec02ef0fb52f132e2bb1e2c (patch) | |
| tree | a835ebdf2088ef88fa681f8fad45f09922c1ae9a /tests/ui/block-result | |
| parent | Adding debian version 1.75.0+dfsg1-5. (diff) | |
| download | rustc-018c4950b9406055dec02ef0fb52f132e2bb1e2c.tar.xz rustc-018c4950b9406055dec02ef0fb52f132e2bb1e2c.zip | |
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/ui/block-result')
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/ui/block-result/block-must-not-have-result-do.stderr b/tests/ui/block-result/block-must-not-have-result-do.stderr index 914886f81..2a94f0a87 100644 --- a/tests/ui/block-result/block-must-not-have-result-do.stderr +++ b/tests/ui/block-result/block-must-not-have-result-do.stderr @@ -4,6 +4,6 @@ error[E0308]: mismatched types LL | true | ^^^^ expected `()`, found `bool` -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/block-result/block-must-not-have-result-res.stderr b/tests/ui/block-result/block-must-not-have-result-res.stderr index b7427462b..e075dc230 100644 --- a/tests/ui/block-result/block-must-not-have-result-res.stderr +++ b/tests/ui/block-result/block-must-not-have-result-res.stderr @@ -6,6 +6,6 @@ LL | fn drop(&mut self) { LL | true | ^^^^ expected `()`, found `bool` -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/block-result/block-must-not-have-result-while.stderr b/tests/ui/block-result/block-must-not-have-result-while.stderr index 7f96aa289..94a4b33da 100644 --- a/tests/ui/block-result/block-must-not-have-result-while.stderr +++ b/tests/ui/block-result/block-must-not-have-result-while.stderr @@ -16,6 +16,6 @@ LL | | LL | | } | |_____- expected this to be `()` -error: aborting due to previous error; 1 warning emitted +error: aborting due to 1 previous error; 1 warning emitted For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/block-result/issue-11714.stderr b/tests/ui/block-result/issue-11714.stderr index 42fb3d3d4..25651328e 100644 --- a/tests/ui/block-result/issue-11714.stderr +++ b/tests/ui/block-result/issue-11714.stderr @@ -9,6 +9,6 @@ LL | fn blah() -> i32 { LL | ; | - help: remove this semicolon to return this value -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/block-result/issue-3563.stderr b/tests/ui/block-result/issue-3563.stderr index be551f6e8..c473a8441 100644 --- a/tests/ui/block-result/issue-3563.stderr +++ b/tests/ui/block-result/issue-3563.stderr @@ -4,6 +4,6 @@ error[E0599]: no method named `b` found for reference `&Self` in the current sco LL | || self.b() | ^ help: there is a method with a similar name: `a` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0599`. diff --git a/tests/ui/block-result/issue-5500.stderr b/tests/ui/block-result/issue-5500.stderr index 417991e9e..71ca8ffe2 100644 --- a/tests/ui/block-result/issue-5500.stderr +++ b/tests/ui/block-result/issue-5500.stderr @@ -14,6 +14,6 @@ LL - &panic!() LL + panic!() | -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/block-result/unexpected-return-on-unit.stderr b/tests/ui/block-result/unexpected-return-on-unit.stderr index 4acb955a8..0b79cf0da 100644 --- a/tests/ui/block-result/unexpected-return-on-unit.stderr +++ b/tests/ui/block-result/unexpected-return-on-unit.stderr @@ -13,6 +13,6 @@ help: try adding a return type LL | fn bar() -> usize { | ++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0308`. |