tests: Update ui test output to nightly-2024-12-15

taiki-e · Dec 15, 2024 · 3d66a6a · 3d66a6a
1 parent 03cd353
commit 3d66a6a
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 43 deletions.
diff --git a/tests/ui/not_unpin/conflict-unpin.stderr b/tests/ui/not_unpin/conflict-unpin.stderr
@@ -6,7 +6,6 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<_, _>`
 7  | |     struct Foo<T, U> {
 8  | |         #[pin]
 ...  |
-11 | |     }
 12 | | }
    | |_^ conflicting implementation for `Foo<_, _>`
 13 |
@@ -24,7 +23,6 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Bar<_, _>`
 18 | |     struct Bar<T, U> {
 19 | |         #[pin]
 ...  |
-22 | |     }
 23 | | }
    | |_^ conflicting implementation for `Bar<_, _>`
 24 |
@@ -42,7 +40,6 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Baz<_, _>`
 29 | |     struct Baz<T, U> {
 30 | |         #[pin]
 ...  |
-33 | |     }
 34 | | }
    | |_^ conflicting implementation for `Baz<_, _>`
 35 |

diff --git a/tests/ui/not_unpin/negative_impls_stable.stderr b/tests/ui/not_unpin/negative_impls_stable.stderr
@@ -6,7 +6,6 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<MyPhant
 7  | |     struct Foo<Pinned, Unpinned> {
 8  | |         #[pin]
 ...  |
-11 | |     }
 12 | | }
    | |_^ conflicting implementation for `Foo<MyPhantomPinned, ()>`
 ...

diff --git a/tests/ui/pin_project/conflict-drop.stderr b/tests/ui/pin_project/conflict-drop.stderr
@@ -5,8 +5,7 @@ error[E0119]: conflicting implementations of trait `MustNotImplDrop` for type `F
 6  | |     struct Foo<T, U> {
 7  | |         #[pin]
 8  | |         future: T,
-9  | |         field: U,
-10 | |     }
+...  |
 11 | | }
    | | ^
    | | |

diff --git a/tests/ui/pin_project/conflict-unpin.stderr b/tests/ui/pin_project/conflict-unpin.stderr
@@ -5,8 +5,7 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<_, _>`
 8  | |     struct Foo<T, U> {
 9  | |         #[pin]
 10 | |         future: T,
-11 | |         field: U,
-12 | |     }
+...  |
 13 | | }
    | |_^ conflicting implementation for `Foo<_, _>`
 ...
@@ -22,8 +21,7 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Bar<_, _>`
 21 | |     struct Bar<T, U> {
 22 | |         #[pin]
 23 | |         future: T,
-24 | |         field: U,
-25 | |     }
+...  |
 26 | | }
    | |_^ conflicting implementation for `Bar<_, _>`
 ...
@@ -39,8 +37,7 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Baz<_, _>`
 32 | |     struct Baz<T, U> {
 33 | |         #[pin]
 34 | |         future: T,
-35 | |         field: U,
-36 | |     }
+...  |
 37 | | }
    | |_^ conflicting implementation for `Baz<_, _>`
 ...
@@ -57,7 +54,6 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Qux<_, _>`
 44 | |     struct Qux<T, U> {
 45 | |         #[pin]
 ...  |
-48 | |     }
 49 | | }
    | |_^ conflicting implementation for `Qux<_, _>`
 ...
@@ -75,7 +71,6 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Fred<_, _>`
 56 | |     struct Fred<T, U> {
 57 | |         #[pin]
 ...  |
-60 | |     }
 61 | | }
    | |_^ conflicting implementation for `Fred<_, _>`
 ...

diff --git a/tests/ui/pin_project/invalid-bounds.stderr b/tests/ui/pin_project/invalid-bounds.stderr
@@ -318,7 +318,6 @@ error: expected `{` after struct name, found `:`
 61 | |     where
 62 | |         T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-65 | |     }
 66 | | }
    | | ^
    | | |
@@ -335,7 +334,6 @@ error: expected one of `+`, `,`, or `{`, found `:`
 61 | |     where
 62 | |         T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-65 | |     }
 66 | | }
    | | ^
    | | |
@@ -353,7 +351,6 @@ error: expected `{` after struct name, found `:`
 61 | |     where
 62 | |         T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-65 | |     }
 66 | | }
    | | ^
    | | |
@@ -370,7 +367,6 @@ error: expected `{` after struct name, found `:`
 61 | |     where
 62 | |         T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-65 | |     }
 66 | | }
    | | ^
    | | |
@@ -387,7 +383,6 @@ error: expected `{` after struct name, found `:`
 70 | |     where
 71 | |         T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-74 | |     }
 75 | | }
    | | ^
    | | |
@@ -404,7 +399,6 @@ error: expected one of `+`, `,`, or `{`, found `:`
 70 | |     where
 71 | |         T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-74 | |     }
 75 | | }
    | | ^
    | | |
@@ -422,7 +416,6 @@ error: expected `{` after struct name, found `:`
 70 | |     where
 71 | |         T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-74 | |     }
 75 | | }
    | | ^
    | | |
@@ -439,7 +432,6 @@ error: expected `{` after struct name, found `:`
 70 | |     where
 71 | |         T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-74 | |     }
 75 | | }
    | | ^
    | | |
@@ -456,7 +448,6 @@ error: expected `{` after struct name, found `:`
 79 | |     where
 80 | |         T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-83 | |     }
 84 | | }
    | | ^
    | | |
@@ -473,7 +464,6 @@ error: expected one of `+`, `,`, or `{`, found `:`
 79 | |     where
 80 | |         T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-83 | |     }
 84 | | }
    | | ^
    | | |
@@ -491,7 +481,6 @@ error: expected `{` after struct name, found `:`
 79 | |     where
 80 | |         T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-83 | |     }
 84 | | }
    | | ^
    | | |
@@ -508,7 +497,6 @@ error: expected `{` after struct name, found `:`
 79 | |     where
 80 | |         T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
 ...  |
-83 | |     }
 84 | | }
    | | ^
    | | |

diff --git a/tests/ui/pin_project/negative_impls_stable.stderr b/tests/ui/pin_project/negative_impls_stable.stderr
@@ -5,8 +5,7 @@ error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<MyPhant
 6  | |     struct Foo<Pinned, Unpinned> {
 7  | |         #[pin]
 8  | |         pinned: Pinned,
-9  | |         unpinned: Unpinned,
-10 | |     }
+...  |
 11 | | }
    | |_^ conflicting implementation for `Foo<MyPhantomPinned, ()>`
 ...

diff --git a/tests/ui/pin_project/packed.stderr b/tests/ui/pin_project/packed.stderr
@@ -5,8 +5,7 @@ error[E0793]: reference to packed field is unaligned
 6  | |     #[repr(packed, C)]
 7  | |     struct Packed {
 8  | |         #[pin]
-9  | |         field: u16,
-10 | |     }
+...  |
 11 | | }
    | |_^
    |
@@ -22,8 +21,7 @@ error[E0793]: reference to packed field is unaligned
 6  | |     #[repr(packed, C)]
 7  | |     struct Packed {
 8  | |         #[pin]
-9  | |         field: u16,
-10 | |     }
+...  |
 11 | | }
    | |_^
    |
@@ -39,8 +37,7 @@ error[E0793]: reference to packed field is unaligned
 6  | |     #[repr(packed, C)]
 7  | |     struct Packed {
 8  | |         #[pin]
-9  | |         field: u16,
-10 | |     }
+...  |
 11 | | }
    | |_^
    |
@@ -56,8 +53,7 @@ error[E0793]: reference to packed field is unaligned
 14 | |     #[repr(packed(2))]
 15 | |     struct PackedN {
 16 | |         #[pin]
-17 | |         field: u32,
-18 | |     }
+...  |
 19 | | }
    | |_^
    |
@@ -73,8 +69,7 @@ error[E0793]: reference to packed field is unaligned
 14 | |     #[repr(packed(2))]
 15 | |     struct PackedN {
 16 | |         #[pin]
-17 | |         field: u32,
-18 | |     }
+...  |
 19 | | }
    | |_^
    |
@@ -90,8 +85,7 @@ error[E0793]: reference to packed field is unaligned
 14 | |     #[repr(packed(2))]
 15 | |     struct PackedN {
 16 | |         #[pin]
-17 | |         field: u32,
-18 | |     }
+...  |
 19 | | }
    | |_^
    |

diff --git a/tests/ui/pinned_drop/call-drop-inner.stderr b/tests/ui/pinned_drop/call-drop-inner.stderr
@@ -12,7 +12,6 @@ note: function defined here
 7  | |         #[pin]
 8  | |         field: u8,
 ...  |
-14 | |     }
 15 | | }
    | |_^
    = note: this error originates in the macro `$crate::__pin_project_make_drop_impl` which comes from the expansion of the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)

diff --git a/tests/ui/pinned_drop/conditional-drop-impl.stderr b/tests/ui/pinned_drop/conditional-drop-impl.stderr
@@ -18,7 +18,6 @@ error[E0367]: `Drop` impl requires `T: Unpin` but the struct it is implemented f
 18 | |     struct PinnedDropImpl<T> {
 19 | |         #[pin]
 ...  |
-25 | |     }
 26 | | }
    | |_^
    |
@@ -30,7 +29,6 @@ note: the implementor must specify the same requirement
 18 | |     struct PinnedDropImpl<T> {
 19 | |         #[pin]
 ...  |
-25 | |     }
 26 | | }
    | |_^
    = note: this error originates in the macro `$crate::__pin_project_make_drop_impl` which comes from the expansion of the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
-Original file line number
+Diff line change
@@ Expand Up @@
 | |     struct Foo<Pinned, Unpinned> {
 | |         #[pin]
     ...  |
-| |     }
 | | }
        | |_^ conflicting implementation for `Foo<MyPhantomPinned, ()>`
     ...
@@ Expand Down @@