Skip to content

Commit 5d1b11b

Browse files
rcnyltfschoen
authored andcommitted
Update tests for 1.66 and switch CI to stable Rust 1.66 (paritytech#13118)
* Update UI tests for 1.66 * Fix `test_enum` assertion for Rust 1.66 * Fix another `test_enum` assertion for Rust 1.66 * Fix another `test_enum` assertion for Rust 1.66 * Fix another `test_enum` assertion for Rust 1.66
1 parent c8d1cdd commit 5d1b11b

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ variables:
4848
CARGO_INCREMENTAL: 0
4949
DOCKER_OS: "debian:stretch"
5050
ARCH: "x86_64"
51-
CI_IMAGE: "paritytech/ci-linux:production"
51+
CI_IMAGE: "paritytech/ci-linux@sha256:9140bc3c843a8b12a3bcf6f5886346536092795bbadfd7f1836362cb28dfcc71"
5252
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
5353
RUSTY_CACHIER_SINGLE_BRANCH: master
5454
RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
2-
--> $DIR/invalid_module_details.rs:9:17
2+
--> tests/construct_runtime_ui/invalid_module_details.rs:9:17
33
|
44
9 | system: System::(),
5-
| ^^
5+
| ^

frame/support/test/tests/derive_no_bound.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fn test_struct_named() {
7272
assert_eq!(a_2, a_1);
7373
assert_eq!(
7474
format!("{:?}", a_1),
75-
String::from("StructNamed { a: 1, b: 2, c: 3, phantom: PhantomData }")
75+
String::from("StructNamed { a: 1, b: 2, c: 3, phantom: PhantomData<(derive_no_bound::ImplNone, derive_no_bound::ImplNone)> }")
7676
);
7777

7878
let b = StructNamed::<Runtime, ImplNone, ImplNone> {
@@ -103,7 +103,7 @@ fn test_struct_unnamed() {
103103
assert_eq!(a_2.1, 2);
104104
assert_eq!(a_2.2, 3);
105105
assert_eq!(a_2, a_1);
106-
assert_eq!(format!("{:?}", a_1), String::from("StructUnnamed(1, 2, 3, PhantomData)"));
106+
assert_eq!(format!("{:?}", a_1), String::from("StructUnnamed(1, 2, 3, PhantomData<(derive_no_bound::ImplNone, derive_no_bound::ImplNone)>)"));
107107

108108
let b = StructUnnamed::<Runtime, ImplNone, ImplNone>(1, 2, 4, Default::default());
109109

@@ -211,11 +211,11 @@ fn test_enum() {
211211

212212
assert_eq!(
213213
format!("{:?}", variant_0),
214-
String::from("Enum::VariantUnnamed(1, 2, 3, PhantomData)"),
214+
String::from("Enum::VariantUnnamed(1, 2, 3, PhantomData<(derive_no_bound::ImplNone, derive_no_bound::ImplNone)>)"),
215215
);
216216
assert_eq!(
217217
format!("{:?}", variant_1),
218-
String::from("Enum::VariantNamed { a: 1, b: 2, c: 3, phantom: PhantomData }"),
218+
String::from("Enum::VariantNamed { a: 1, b: 2, c: 3, phantom: PhantomData<(derive_no_bound::ImplNone, derive_no_bound::ImplNone)> }"),
219219
);
220220
assert_eq!(format!("{:?}", variant_2), String::from("Enum::VariantUnit"));
221221
assert_eq!(format!("{:?}", variant_3), String::from("Enum::VariantUnit2"));
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected `DispatchResultWithPostInfo` or `DispatchResult`
2-
--> $DIR/call_invalid_return.rs:17:39
2+
--> tests/pallet_ui/call_invalid_return.rs:17:39
33
|
44
17 | pub fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
5-
| ^^
5+
| ^

0 commit comments

Comments
 (0)