Skip to content

Commit 1d2be53

Browse files
author
toasteater
committed
Update UI tests
Update tests with the added `glam` dependency. Run tests that depend on Span::join only on nightly.
1 parent fce0a9b commit 1d2be53

File tree

3 files changed

+32
-13
lines changed

3 files changed

+32
-13
lines changed

gdnative/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ gdnative-bindings = { optional = true, path = "../gdnative-bindings", version =
2626

2727
[dev-dependencies]
2828
trybuild = "1.0"
29+
rustversion = "1.0"
2930

3031
[package.metadata.docs.rs]
3132
all-features = true

gdnative/tests/ui.rs

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,39 @@ fn ui_tests() {
2020

2121
// ToVariant
2222
t.compile_fail("tests/ui/to_variant_fail_01.rs");
23-
t.compile_fail("tests/ui/to_variant_fail_02.rs");
24-
t.compile_fail("tests/ui/to_variant_fail_03.rs");
23+
to_variant_ui_path(&t);
2524
t.compile_fail("tests/ui/to_variant_fail_04.rs");
2625
t.compile_fail("tests/ui/to_variant_fail_05.rs");
2726
t.compile_fail("tests/ui/to_variant_fail_06.rs");
2827
t.compile_fail("tests/ui/to_variant_fail_07.rs");
2928

3029
// FromVariant
3130
t.compile_fail("tests/ui/from_variant_fail_01.rs");
32-
t.compile_fail("tests/ui/from_variant_fail_02.rs");
33-
t.compile_fail("tests/ui/from_variant_fail_03.rs");
31+
from_variant_ui_path(&t);
3432
t.compile_fail("tests/ui/from_variant_fail_04.rs");
3533
t.compile_fail("tests/ui/from_variant_fail_05.rs");
3634
t.compile_fail("tests/ui/from_variant_fail_06.rs");
3735
t.compile_fail("tests/ui/from_variant_fail_07.rs");
3836
}
37+
38+
// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
39+
#[rustversion::not(nightly)]
40+
fn to_variant_ui_path(_t: &trybuild::TestCases) {}
41+
42+
// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
43+
#[rustversion::nightly]
44+
fn to_variant_ui_path(t: &trybuild::TestCases) {
45+
t.compile_fail("tests/ui/to_variant_fail_02.rs");
46+
t.compile_fail("tests/ui/to_variant_fail_03.rs");
47+
}
48+
49+
// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
50+
#[rustversion::not(nightly)]
51+
fn from_variant_ui_path(_t: &trybuild::TestCases) {}
52+
53+
// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
54+
#[rustversion::nightly]
55+
fn from_variant_ui_path(t: &trybuild::TestCases) {
56+
t.compile_fail("tests/ui/from_variant_fail_02.rs");
57+
t.compile_fail("tests/ui/from_variant_fail_03.rs");
58+
}

gdnative/tests/ui/derive_fail_methods_missing_new.stderr

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ error[E0599]: no function or associated item named `new` found for struct `Foo`
1313
candidate #2: `gdnative::GodotObject`
1414
candidate #3: `PtrWrapper`
1515
candidate #4: `glam::core::traits::matrix::Matrix2x2`
16-
candidate #5: `glam::core::traits::matrix::Matrix3x3`
17-
candidate #6: `glam::core::traits::matrix::Matrix4x4`
18-
candidate #7: `glam::core::traits::vector::MaskVector2`
19-
candidate #8: `glam::core::traits::vector::MaskVector3`
20-
candidate #9: `glam::core::traits::vector::MaskVector4`
21-
candidate #10: `glam::core::traits::vector::Vector2`
22-
candidate #11: `glam::core::traits::vector::Vector3`
23-
candidate #12: `glam::core::traits::vector::Vector4`
24-
candidate #13: `parking_lot_core::thread_parker::ThreadParkerT`
16+
candidate #5: `glam::core::traits::vector::MaskVector2`
17+
candidate #6: `glam::core::traits::vector::MaskVector3`
18+
candidate #7: `glam::core::traits::vector::MaskVector4`
19+
candidate #8: `glam::core::traits::vector::Vector2`
20+
candidate #9: `glam::core::traits::vector::Vector3`
21+
candidate #10: `glam::core::traits::vector::Vector4`
22+
candidate #11: `parking_lot_core::thread_parker::ThreadParkerT`
2523
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)