diff options
| author | bors <bors@rust-lang.org> | 2025-05-09 20:37:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-09 20:37:37 +0000 |
| commit | 17067e9ac6d7ecb70e50f92c1944e545188d2359 (patch) | |
| tree | 10cdfd82bfa6bb95d7e99b7ab53d8121fc7a8913 /tests/ui/traits/object/pretty.stderr | |
| parent | af91af44eb85ceac634afa72cc73be4af358b350 (diff) | |
| parent | 908c30b3e1b758d46501de460163e9761c65534f (diff) | |
| download | rust-1.87.0.tar.gz rust-1.87.0.zip | |
Auto merge of #140859 - pietroalbini:pa-stable, r=pietroalbini 1.87.0
[stable] Prepare the 1.87.0 release Preparing the stable artifacts as described in the release process. This PR also includes the following last minute backports: * https://github.com/rust-lang/rust/pull/140810 * https://github.com/rust-lang/rust/pull/140601 * https://github.com/rust-lang/rust/pull/140684 r? `@ghost`
Diffstat (limited to 'tests/ui/traits/object/pretty.stderr')
| -rw-r--r-- | tests/ui/traits/object/pretty.stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ui/traits/object/pretty.stderr b/tests/ui/traits/object/pretty.stderr index 37fe142951d..2f9fdf151f0 100644 --- a/tests/ui/traits/object/pretty.stderr +++ b/tests/ui/traits/object/pretty.stderr @@ -154,12 +154,12 @@ error[E0308]: mismatched types --> $DIR/pretty.rs:41:56 | LL | fn dyn_has_gat(x: &dyn HasGat<u8, Assoc<bool> = ()>) { x } - | - ^ expected `()`, found `&dyn HasGat<u8>` + | - ^ expected `()`, found `&dyn HasGat<u8, Assoc<bool> = ()>` | | - | help: try adding a return type: `-> &dyn HasGat<u8>` + | help: try adding a return type: `-> &dyn HasGat<u8, Assoc<bool> = ()>` | = note: expected unit type `()` - found reference `&dyn HasGat<u8>` + found reference `&dyn HasGat<u8, Assoc<bool> = ()>` error: aborting due to 14 previous errors; 1 warning emitted |