tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-08-28 00:00:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

macros: update trybuild output for Rust 1.59.0 (#4536)

Browse Source 
## Motivation

Rust error messages seem to have changed a bit in 1.59.0

## Solution

Update the `trybuild` stderr output.

This should unbreak the tests on the latest Rust (and fix CI).
This commit is contained in:
Eliza Weisman
2022-02-24 11:52:47 -08:00
committed by GitHub
parent 769fb1547f
commit dfac73d580
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests-build/tests/fail/macros_invalid_input.stderr
+8
View File
@@ -69,3 +69,11 @@ error: second test attribute is supplied
| |
37 | #[test] 37 | #[test]
| ^^^^^^^ | ^^^^^^^
error: duplicated attribute
--> $DIR/macros_invalid_input.rs:37:1
|
37 | #[test]
| ^^^^^^^
|
= note: `-D duplicate-macro-attributes` implied by `-D warnings`
tests-build/tests/fail/macros_type_mismatch.stderr
+9 -13
View File
@@ -1,25 +1,21 @@
error[E0308]: mismatched types error[E0308]: mismatched types
--> tests/fail/macros_type_mismatch.rs:5:5 --> $DIR/macros_type_mismatch.rs:5:5
| |
4 | async fn missing_semicolon_or_return_type() {
| - possibly return type missing here?
5 | Ok(()) 5 | Ok(())
| ^^^^^^ expected `()`, found enum `Result` | ^^^^^^- help: consider using a semicolon here: `;`
| |
| expected `()`, found enum `Result`
| |
= note: expected unit type `()` = note: expected unit type `()`
found enum `Result<(), _>` found enum `Result<(), _>`
help: consider using a semicolon here
|
5 | Ok(());
| +
help: try adding a return type
|
4 | async fn missing_semicolon_or_return_type() -> Result<(), _> {
| ++++++++++++++++
error[E0308]: mismatched types error[E0308]: mismatched types
--> tests/fail/macros_type_mismatch.rs:10:5 --> $DIR/macros_type_mismatch.rs:10:5
| |
9 | async fn missing_return_type() { 9 | async fn missing_return_type() {
| - help: try adding a return type: `-> Result<(), _>` | - possibly return type missing here?
10 | return Ok(()); 10 | return Ok(());
| ^^^^^^^^^^^^^^ expected `()`, found enum `Result` | ^^^^^^^^^^^^^^ expected `()`, found enum `Result`
| |
@@ -27,7 +23,7 @@ error[E0308]: mismatched types
found enum `Result<(), _>` found enum `Result<(), _>`
error[E0308]: mismatched types error[E0308]: mismatched types
--> tests/fail/macros_type_mismatch.rs:23:5 --> $DIR/macros_type_mismatch.rs:23:5
| |
14 | async fn extra_semicolon() -> Result<(), ()> { 14 | async fn extra_semicolon() -> Result<(), ()> {
| -------------- expected `Result<(), ()>` because of return type | -------------- expected `Result<(), ()>` because of return type