Skip to content

Commit 6793b8a

Browse files
authored
Merge pull request #77 from Rust-for-Linux/dev/fix-ui-tests
- update `trybuild` and `macrotest` dev-dependencies - tests: fix nightly output
2 parents 3b6ee89 + ab04057 commit 6793b8a

File tree

5 files changed

+47
-86
lines changed

5 files changed

+47
-86
lines changed

Cargo.lock

Lines changed: 44 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/ui/compile-fail/pin_data/missing_pin.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ error[E0277]: the trait bound `impl PinInit<usize>: Init<usize, _>` is not satis
1313
note: required by a bound in `__ThePinData::a`
1414
--> tests/ui/compile-fail/pin_data/missing_pin.rs:4:1
1515
|
16-
4 | #[pin_data]
16+
4 | #[pin_data]
1717
| ^^^^^^^^^^^ required by this bound in `__ThePinData::a`
18-
5 | struct Foo {
19-
6 | a: usize,
18+
5 | struct Foo {
19+
6 | a: usize,
2020
| - required by a bound in this associated function
2121
= note: this error originates in the macro `$crate::__pin_data` which comes from the expansion of the attribute macro `pin_data` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui/compile-fail/pinned_drop/no_fn.stderr

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,3 @@ note: while trying to match keyword `fn`
1010
| fn drop($($sig:tt)*) {
1111
| ^^
1212
= note: this error originates in the attribute macro `pinned_drop` (in Nightly builds, run with -Z macro-backtrace for more info)
13-
14-
error[E0277]: the trait bound `Foo: PinnedDrop` is not satisfied
15-
--> tests/ui/compile-fail/pinned_drop/no_fn.rs:3:1
16-
|
17-
3 | #[pin_data(PinnedDrop)]
18-
| ^^^^^^^^^^^^^^^^^^^^^^^
19-
| |
20-
| the trait `PinnedDrop` is not implemented for `Foo`
21-
| required by a bound introduced by this call
22-
|
23-
= note: this error originates in the macro `$crate::__pin_data` which comes from the expansion of the attribute macro `pin_data` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui/compile-fail/pinned_drop/unexpected_additional_item.stderr

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,3 @@ note: while trying to match `)`
99
|
1010
| ),
1111
| ^
12-
13-
error[E0277]: the trait bound `Foo: PinnedDrop` is not satisfied
14-
--> tests/ui/compile-fail/pinned_drop/unexpected_additional_item.rs:3:1
15-
|
16-
3 | #[pin_data(PinnedDrop)]
17-
| ^^^^^^^^^^^^^^^^^^^^^^^
18-
| |
19-
| the trait `PinnedDrop` is not implemented for `Foo`
20-
| required by a bound introduced by this call
21-
|
22-
= note: this error originates in the macro `$crate::__pin_data` which comes from the expansion of the attribute macro `pin_data` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui/compile-fail/pinned_drop/unexpected_item.stderr

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,3 @@ note: while trying to match keyword `fn`
99
|
1010
| fn drop($($sig:tt)*) {
1111
| ^^
12-
13-
error[E0277]: the trait bound `Foo: PinnedDrop` is not satisfied
14-
--> tests/ui/compile-fail/pinned_drop/unexpected_item.rs:3:1
15-
|
16-
3 | #[pin_data(PinnedDrop)]
17-
| ^^^^^^^^^^^^^^^^^^^^^^^
18-
| |
19-
| the trait `PinnedDrop` is not implemented for `Foo`
20-
| required by a bound introduced by this call
21-
|
22-
= note: this error originates in the macro `$crate::__pin_data` which comes from the expansion of the attribute macro `pin_data` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)