Skip to content

Commit 8ee868d

Browse files
[ci] Roll pinned stable toolchain (#2366)
1 parent c3aaddc commit 8ee868d

11 files changed

+26
-30
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ zerocopy-diagnostic-on-unimplemented = "1.78.0"
4747

4848
[package.metadata.ci]
4949
# The versions of the stable and nightly compiler toolchains to use in CI.
50-
pinned-stable = "1.84.1"
50+
pinned-stable = "1.85.0"
5151
pinned-nightly = "nightly-2024-11-06"
5252

5353
[package.metadata.docs.rs]

tests/ui-stable/invalid-impls/invalid-impls.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ note: required by a bound in `_::Subtrait`
2121
26 | impl_or_verify!(T => TryFromBytes for Foo<T>);
2222
| --------------------------------------------- in this macro invocation
2323
= note: this error originates in the derive macro `FromBytes` which comes from the expansion of the macro `impl_or_verify` (in Nightly builds, run with -Z macro-backtrace for more info)
24-
help: consider restricting type parameter `T`
24+
help: consider restricting type parameter `T` with trait `TryFromBytes`
2525
|
2626
26 | impl_or_verify!(T: zerocopy::TryFromBytes => TryFromBytes for Foo<T>);
2727
| ++++++++++++++++++++++++
@@ -49,7 +49,7 @@ note: required by a bound in `_::Subtrait`
4949
27 | impl_or_verify!(T => FromZeros for Foo<T>);
5050
| ------------------------------------------ in this macro invocation
5151
= note: this error originates in the derive macro `FromBytes` which comes from the expansion of the macro `impl_or_verify` (in Nightly builds, run with -Z macro-backtrace for more info)
52-
help: consider restricting type parameter `T`
52+
help: consider restricting type parameter `T` with trait `FromZeros`
5353
|
5454
27 | impl_or_verify!(T: zerocopy::FromZeros => FromZeros for Foo<T>);
5555
| +++++++++++++++++++++
@@ -77,7 +77,7 @@ note: required by a bound in `_::Subtrait`
7777
28 | impl_or_verify!(T => FromBytes for Foo<T>);
7878
| ------------------------------------------ in this macro invocation
7979
= note: this error originates in the derive macro `FromBytes` which comes from the expansion of the macro `impl_or_verify` (in Nightly builds, run with -Z macro-backtrace for more info)
80-
help: consider restricting type parameter `T`
80+
help: consider restricting type parameter `T` with trait `FromBytes`
8181
|
8282
28 | impl_or_verify!(T: zerocopy::FromBytes => FromBytes for Foo<T>);
8383
| +++++++++++++++++++++
@@ -105,7 +105,7 @@ note: required by a bound in `_::Subtrait`
105105
29 | impl_or_verify!(T => IntoBytes for Foo<T>);
106106
| ------------------------------------------ in this macro invocation
107107
= note: this error originates in the derive macro `IntoBytes` which comes from the expansion of the macro `impl_or_verify` (in Nightly builds, run with -Z macro-backtrace for more info)
108-
help: consider restricting type parameter `T`
108+
help: consider restricting type parameter `T` with trait `IntoBytes`
109109
|
110110
29 | impl_or_verify!(T: zerocopy::IntoBytes => IntoBytes for Foo<T>);
111111
| +++++++++++++++++++++
@@ -133,7 +133,7 @@ note: required by a bound in `_::Subtrait`
133133
30 | impl_or_verify!(T => Unaligned for Foo<T>);
134134
| ------------------------------------------ in this macro invocation
135135
= note: this error originates in the derive macro `Unaligned` which comes from the expansion of the macro `impl_or_verify` (in Nightly builds, run with -Z macro-backtrace for more info)
136-
help: consider restricting type parameter `T`
136+
help: consider restricting type parameter `T` with trait `Unaligned`
137137
|
138138
30 | impl_or_verify!(T: zerocopy::Unaligned => Unaligned for Foo<T>);
139139
| +++++++++++++++++++++

tests/ui-stable/transmute-mut-const.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ note: `const` item defined here
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
1414
= note: `#[warn(const_item_mutation)]` on by default
1515

16-
error[E0015]: cannot call non-const fn `transmute_mut::<'_, '_, [u8; 2], [u8; 2]>` in constants
16+
error[E0015]: cannot call non-const function `transmute_mut::<'_, '_, [u8; 2], [u8; 2]>` in constants
1717
--> tests/ui-stable/transmute-mut-const.rs:20:37
1818
|
1919
20 | const CONST_CONTEXT: &mut [u8; 2] = transmute_mut!(&mut ARRAY_OF_U8S);

tests/ui-stable/transmute-mut-src-dst-not-references.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ warning: this function depends on never type fallback being `()`
2121
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2222
|
2323
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in Rust 2024 and in a future release in all editions!
24-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
24+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
2525
= help: specify the types explicitly
2626
note: in edition 2024, the requirement `!: FromBytes` will fail
2727
--> tests/ui-stable/transmute-mut-src-dst-not-references.rs:17:44
@@ -43,7 +43,7 @@ warning: never type fallback affects this call to an `unsafe` function
4343
| ^^^^^^^^^^^^^^^^^^^^^^
4444
|
4545
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
46-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
46+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
4747
= help: specify the type explicitly
4848
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
4949
= note: this warning originates in the macro `$crate::assert_size_eq` which comes from the expansion of the macro `transmute_mut` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui-stable/transmute-mut-src-immutable.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ warning: this function depends on never type fallback being `()`
1717
| ^^^^^^^^^^^^^^^^^^^^^^
1818
|
1919
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in Rust 2024 and in a future release in all editions!
20-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
20+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
2121
= help: specify the types explicitly
2222
note: in edition 2024, the requirement `!: FromBytes` will fail
2323
--> tests/ui-stable/transmute-mut-src-immutable.rs:17:22
@@ -39,7 +39,7 @@ warning: never type fallback affects this call to an `unsafe` function
3939
| ^^^^^^^^^^^^^^^^^^^^
4040
|
4141
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
42-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
42+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
4343
= help: specify the type explicitly
4444
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
4545
= note: this warning originates in the macro `$crate::assert_size_eq` which comes from the expansion of the macro `transmute_mut` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui-stable/transmute-mut-src-not-a-reference.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ warning: this function depends on never type fallback being `()`
2121
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2222
|
2323
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in Rust 2024 and in a future release in all editions!
24-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
24+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
2525
= help: specify the types explicitly
2626
note: in edition 2024, the requirement `!: FromBytes` will fail
2727
--> tests/ui-stable/transmute-mut-src-not-a-reference.rs:17:38
@@ -43,7 +43,7 @@ warning: never type fallback affects this call to an `unsafe` function
4343
| ^^^^^^^^^^^^^^^^^^^^^^
4444
|
4545
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
46-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
46+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
4747
= help: specify the type explicitly
4848
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
4949
= note: this warning originates in the macro `$crate::assert_size_eq` which comes from the expansion of the macro `transmute_mut` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui-stable/transmute-ref-src-dst-not-references.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ warning: this function depends on never type fallback being `()`
8484
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8585
|
8686
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in Rust 2024 and in a future release in all editions!
87-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
87+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
8888
= help: specify the types explicitly
8989
note: in edition 2024, the requirement `!: IntoBytes` will fail
9090
--> tests/ui-stable/transmute-ref-src-dst-not-references.rs:17:39
@@ -106,7 +106,7 @@ warning: never type fallback affects this call to an `unsafe` function
106106
| ^^^^^^^^^^^^^^^^^^^^^^
107107
|
108108
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
109-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
109+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
110110
= help: specify the type explicitly
111111
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
112112
= note: this warning originates in the macro `$crate::assert_size_eq` which comes from the expansion of the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -118,6 +118,6 @@ warning: never type fallback affects this call to an `unsafe` function
118118
| ^^^^^^^^^^^^^^^^^^^^^^
119119
|
120120
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
121-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
121+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
122122
= help: specify the type explicitly
123123
= note: this warning originates in the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui-stable/transmute-ref-src-not-a-reference.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ warning: this function depends on never type fallback being `()`
2121
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2222
|
2323
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in Rust 2024 and in a future release in all editions!
24-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
24+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
2525
= help: specify the types explicitly
2626
note: in edition 2024, the requirement `!: IntoBytes` will fail
2727
--> tests/ui-stable/transmute-ref-src-not-a-reference.rs:17:34
@@ -43,7 +43,7 @@ warning: never type fallback affects this call to an `unsafe` function
4343
| ^^^^^^^^^^^^^^^^^^^^^^
4444
|
4545
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
46-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
46+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
4747
= help: specify the type explicitly
4848
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
4949
= note: this warning originates in the macro `$crate::assert_size_eq` which comes from the expansion of the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -55,6 +55,6 @@ warning: never type fallback affects this call to an `unsafe` function
5555
| ^^^^^^^^^^^^^^^^^^^^^^
5656
|
5757
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
58-
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
58+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>
5959
= help: specify the type explicitly
6060
= note: this warning originates in the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)

zerocopy-derive/tests/ui-stable/mid_compile_pass.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ note: required for `KL13<T>` to implement `KnownLayout`
1313
55 | #[derive(KnownLayout)]
1414
| ^^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
1515
= note: this error originates in the derive macro `KnownLayout` (in Nightly builds, run with -Z macro-backtrace for more info)
16-
help: consider restricting type parameter `T`
16+
help: consider restricting type parameter `T` with trait `KnownLayout`
1717
|
1818
59 | fn test_kl13<T: zerocopy::KnownLayout>(t: T) -> impl KnownLayout {
1919
| +++++++++++++++++++++++

zerocopy-derive/tests/ui-stable/union.stderr

+3-5
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ warning: unexpected `cfg` condition name: `zerocopy_derive_union_into_bytes`
6969
| ^^^^^^^^^
7070
|
7171
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `docsrs`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
72-
= help: consider using a Cargo feature instead
73-
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
74-
[lints.rust]
75-
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zerocopy_derive_union_into_bytes)'] }
76-
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(zerocopy_derive_union_into_bytes)");` to the top of the `build.rs`
72+
= note: using a cfg inside a derive macro will use the cfgs from the destination crate and not the ones from the defining crate
73+
= help: try referring to `IntoBytes` crate for guidance on how handle this unexpected cfg
74+
= help: the derive macro `IntoBytes` may come from an old version of the `zerocopy_derive` crate, try updating your dependency with `cargo update -p zerocopy_derive`
7775
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
7876
= note: `#[warn(unexpected_cfgs)]` on by default
7977
= note: this warning originates in the derive macro `IntoBytes` (in Nightly builds, run with -Z macro-backtrace for more info)

zerocopy-derive/tests/ui-stable/union_into_bytes_cfg/union_into_bytes_cfg.stderr

+3-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ warning: unexpected `cfg` condition name: `zerocopy_derive_union_into_bytes`
1414
| ^^^^^^^^^
1515
|
1616
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `docsrs`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
17-
= help: consider using a Cargo feature instead
18-
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
19-
[lints.rust]
20-
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zerocopy_derive_union_into_bytes)'] }
21-
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(zerocopy_derive_union_into_bytes)");` to the top of the `build.rs`
17+
= note: using a cfg inside a derive macro will use the cfgs from the destination crate and not the ones from the defining crate
18+
= help: try referring to `IntoBytes` crate for guidance on how handle this unexpected cfg
19+
= help: the derive macro `IntoBytes` may come from an old version of the `zerocopy_derive` crate, try updating your dependency with `cargo update -p zerocopy_derive`
2220
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
2321
= note: `#[warn(unexpected_cfgs)]` on by default
2422
= note: this warning originates in the derive macro `IntoBytes` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)