Skip to content

Commit 685db31

Browse files
bors[bot]Bromeon
andauthored
Merge #851
851: Fix UI tests, whitespace in error messages is different in Rust 1.58 r=Bromeon a=Bromeon For some reason, Rust changes their whitespacing in error messages every couple of versions. This breaks UI tests and makes CI fail. bors r+ Co-authored-by: Jan Haller <[email protected]>
2 parents 25603b0 + c4a1a77 commit 685db31

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

gdnative/tests/ui/from_variant_fail_01.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
error: Missing macro arguments
2-
expecting #[variant(...)]. See documentation:
3-
https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes
2+
expecting #[variant(...)]. See documentation:
3+
https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes
44
--> $DIR/from_variant_fail_01.rs:5:7
55
|
66
5 | #[variant]

gdnative/tests/ui/from_variant_fail_07.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unknown argument, expected one of:
2-
to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip
2+
to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip
33
--> $DIR/from_variant_fail_07.rs:5:15
44
|
55
5 | #[variant(aoeu = "aoeu")]

gdnative/tests/ui/to_variant_fail_01.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
error: Missing macro arguments
2-
expecting #[variant(...)]. See documentation:
3-
https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes
2+
expecting #[variant(...)]. See documentation:
3+
https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes
44
--> $DIR/to_variant_fail_01.rs:5:7
55
|
66
5 | #[variant]

gdnative/tests/ui/to_variant_fail_07.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unknown argument, expected one of:
2-
to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip
2+
to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip
33
--> $DIR/to_variant_fail_07.rs:5:15
44
|
55
5 | #[variant(aoeu = "aoeu")]

0 commit comments

Comments
 (0)