Skip to content

Commit

Permalink
[ci] Roll pinned stable toolchain (#2225)
Browse files Browse the repository at this point in the history
gherrit-pr-id: I57f775eb6a25ab060c7f4473bac30287e01e0b68
  • Loading branch information
google-pr-creation-bot authored Jan 28, 2025
1 parent 1d6fa56 commit 98b95d3
Show file tree
Hide file tree
Showing 19 changed files with 121 additions and 58 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ jobs:
toolchain: "zerocopy-core-error"
- crate: "zerocopy-derive"
toolchain: "zerocopy-diagnostic-on-unimplemented"
# Exclude stable/wasm since wasm is no longer provided via rustup on
# stable.
- toolchain: "stable"
target: "wasm32-wasi"
# Exclude most targets targets from the `zerocopy-core-error`
# toolchain since the `zerocopy-core-error` feature is unrelated to
# compilation target. This only leaves i686 and x86_64 targets.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ zerocopy-diagnostic-on-unimplemented = "1.78.0"

[package.metadata.ci]
# The versions of the stable and nightly compiler toolchains to use in CI.
pinned-stable = "1.83.0"
pinned-stable = "1.84.0"
pinned-nightly = "nightly-2024-11-06"

[package.metadata.docs.rs]
Expand Down
10 changes: 5 additions & 5 deletions tests/ui-stable/invalid-impls/invalid-impls.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ error[E0277]: the trait bound `T: zerocopy::TryFromBytes` is not satisfied
--> tests/ui-stable/invalid-impls/invalid-impls.rs:26:39
|
26 | impl_or_verify!(T => TryFromBytes for Foo<T>);
| ^^^^^^ the trait `zerocopy::TryFromBytes` is not implemented for `T`, which is required by `Foo<T>: zerocopy::TryFromBytes`
| ^^^^^^ the trait `zerocopy::TryFromBytes` is not implemented for `T`
|
= note: Consider adding `#[derive(TryFromBytes)]` to `T`
note: required for `Foo<T>` to implement `zerocopy::TryFromBytes`
Expand Down Expand Up @@ -30,7 +30,7 @@ error[E0277]: the trait bound `T: zerocopy::FromZeros` is not satisfied
--> tests/ui-stable/invalid-impls/invalid-impls.rs:27:36
|
27 | impl_or_verify!(T => FromZeros for Foo<T>);
| ^^^^^^ the trait `zerocopy::FromZeros` is not implemented for `T`, which is required by `Foo<T>: zerocopy::FromZeros`
| ^^^^^^ the trait `zerocopy::FromZeros` is not implemented for `T`
|
= note: Consider adding `#[derive(FromZeros)]` to `T`
note: required for `Foo<T>` to implement `zerocopy::FromZeros`
Expand Down Expand Up @@ -58,7 +58,7 @@ error[E0277]: the trait bound `T: zerocopy::FromBytes` is not satisfied
--> tests/ui-stable/invalid-impls/invalid-impls.rs:28:36
|
28 | impl_or_verify!(T => FromBytes for Foo<T>);
| ^^^^^^ the trait `zerocopy::FromBytes` is not implemented for `T`, which is required by `Foo<T>: zerocopy::FromBytes`
| ^^^^^^ the trait `zerocopy::FromBytes` is not implemented for `T`
|
= note: Consider adding `#[derive(FromBytes)]` to `T`
note: required for `Foo<T>` to implement `zerocopy::FromBytes`
Expand Down Expand Up @@ -86,7 +86,7 @@ error[E0277]: the trait bound `T: zerocopy::IntoBytes` is not satisfied
--> tests/ui-stable/invalid-impls/invalid-impls.rs:29:36
|
29 | impl_or_verify!(T => IntoBytes for Foo<T>);
| ^^^^^^ the trait `zerocopy::IntoBytes` is not implemented for `T`, which is required by `Foo<T>: zerocopy::IntoBytes`
| ^^^^^^ the trait `zerocopy::IntoBytes` is not implemented for `T`
|
= note: Consider adding `#[derive(IntoBytes)]` to `T`
note: required for `Foo<T>` to implement `zerocopy::IntoBytes`
Expand Down Expand Up @@ -114,7 +114,7 @@ error[E0277]: the trait bound `T: zerocopy::Unaligned` is not satisfied
--> tests/ui-stable/invalid-impls/invalid-impls.rs:30:36
|
30 | impl_or_verify!(T => Unaligned for Foo<T>);
| ^^^^^^ the trait `zerocopy::Unaligned` is not implemented for `T`, which is required by `Foo<T>: zerocopy::Unaligned`
| ^^^^^^ the trait `zerocopy::Unaligned` is not implemented for `T`
|
= note: Consider adding `#[derive(Unaligned)]` to `T`
note: required for `Foo<T>` to implement `zerocopy::Unaligned`
Expand Down
6 changes: 3 additions & 3 deletions tests/ui-stable/transmute-mut-dst-unsized.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ error[E0277]: the size for values of type `[u8]` cannot be known at compilation
|
= help: the trait `Sized` is not implemented for `[u8]`
note: required by an implicit `Sized` bound in `std::intrinsics::transmute`
--> $RUST/core/src/intrinsics.rs
--> $RUST/core/src/intrinsics/mod.rs
|
| pub fn transmute<Src, Dst>(src: Src) -> Dst;
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
| pub const unsafe fn transmute<Src, Dst>(_src: Src) -> Dst {
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
= note: this error 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)

error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
Expand Down
9 changes: 7 additions & 2 deletions tests/ui-stable/transmute-mut-src-dst-not-references.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ warning: this function depends on never type fallback being `()`
17 | const SRC_DST_NOT_REFERENCES: &mut usize = transmute_mut!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= 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!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the types explicitly
note: in edition 2024, the requirement `!: FromBytes` will fail
Expand All @@ -30,14 +30,19 @@ note: in edition 2024, the requirement `!: FromBytes` will fail
| ^^^^^^^^^^^^^^^^^^^^^^
= note: `#[warn(dependency_on_unit_never_type_fallback)]` on by default
= note: this warning originates in the macro `transmute_mut` (in Nightly builds, run with -Z macro-backtrace for more info)
help: use `()` annotations to avoid fallback changes
--> src/macros.rs
|
| let e: &mut () = $e;
| ~~

warning: never type fallback affects this call to an `unsafe` function
--> tests/ui-stable/transmute-mut-src-dst-not-references.rs:17:44
|
17 | const SRC_DST_NOT_REFERENCES: &mut usize = transmute_mut!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this will change its meaning in a future release!
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the type explicitly
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
Expand Down
6 changes: 3 additions & 3 deletions tests/ui-stable/transmute-mut-src-dst-unsized.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ error[E0277]: the size for values of type `[u8]` cannot be known at compilation
|
= help: the trait `Sized` is not implemented for `[u8]`
note: required by an implicit `Sized` bound in `std::intrinsics::transmute`
--> $RUST/core/src/intrinsics.rs
--> $RUST/core/src/intrinsics/mod.rs
|
| pub fn transmute<Src, Dst>(src: Src) -> Dst;
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
| pub const unsafe fn transmute<Src, Dst>(_src: Src) -> Dst {
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
= note: this error 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)

error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
Expand Down
9 changes: 7 additions & 2 deletions tests/ui-stable/transmute-mut-src-immutable.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ warning: this function depends on never type fallback being `()`
15 | fn ref_src_immutable() {
| ^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= 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!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the types explicitly
note: in edition 2024, the requirement `!: FromBytes` will fail
Expand All @@ -26,14 +26,19 @@ note: in edition 2024, the requirement `!: FromBytes` will fail
| ^^^^^^^^^^^^^^^^^^^^
= note: `#[warn(dependency_on_unit_never_type_fallback)]` on by default
= note: this warning originates in the macro `transmute_mut` (in Nightly builds, run with -Z macro-backtrace for more info)
help: use `()` annotations to avoid fallback changes
--> src/macros.rs
|
| let e: &mut () = $e;
| ~~

warning: never type fallback affects this call to an `unsafe` function
--> tests/ui-stable/transmute-mut-src-immutable.rs:17:22
|
17 | let _: &mut u8 = transmute_mut!(&0u8);
| ^^^^^^^^^^^^^^^^^^^^
|
= warning: this will change its meaning in a future release!
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the type explicitly
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
Expand Down
9 changes: 7 additions & 2 deletions tests/ui-stable/transmute-mut-src-not-a-reference.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ warning: this function depends on never type fallback being `()`
17 | const SRC_NOT_A_REFERENCE: &mut u8 = transmute_mut!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= 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!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the types explicitly
note: in edition 2024, the requirement `!: FromBytes` will fail
Expand All @@ -30,14 +30,19 @@ note: in edition 2024, the requirement `!: FromBytes` will fail
| ^^^^^^^^^^^^^^^^^^^^^^
= note: `#[warn(dependency_on_unit_never_type_fallback)]` on by default
= note: this warning originates in the macro `transmute_mut` (in Nightly builds, run with -Z macro-backtrace for more info)
help: use `()` annotations to avoid fallback changes
--> src/macros.rs
|
| let e: &mut () = $e;
| ~~

warning: never type fallback affects this call to an `unsafe` function
--> tests/ui-stable/transmute-mut-src-not-a-reference.rs:17:38
|
17 | const SRC_NOT_A_REFERENCE: &mut u8 = transmute_mut!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this will change its meaning in a future release!
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the type explicitly
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
Expand Down
6 changes: 3 additions & 3 deletions tests/ui-stable/transmute-ref-dst-unsized.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ error[E0277]: the size for values of type `[u8]` cannot be known at compilation
|
= help: the trait `Sized` is not implemented for `[u8]`
note: required by an implicit `Sized` bound in `std::intrinsics::transmute`
--> $RUST/core/src/intrinsics.rs
--> $RUST/core/src/intrinsics/mod.rs
|
| pub fn transmute<Src, Dst>(src: Src) -> Dst;
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
| pub const unsafe fn transmute<Src, Dst>(_src: Src) -> Dst {
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
= note: this error 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)

error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
Expand Down
11 changes: 8 additions & 3 deletions tests/ui-stable/transmute-ref-src-dst-not-references.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ warning: this function depends on never type fallback being `()`
17 | const SRC_DST_NOT_REFERENCES: usize = transmute_ref!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= 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!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the types explicitly
note: in edition 2024, the requirement `!: IntoBytes` will fail
Expand All @@ -93,14 +93,19 @@ note: in edition 2024, the requirement `!: IntoBytes` will fail
| ^^^^^^^^^^^^^^^^^^^^^^
= note: `#[warn(dependency_on_unit_never_type_fallback)]` on by default
= note: this warning originates in the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)
help: use `()` annotations to avoid fallback changes
--> src/macros.rs
|
| let e: &() = $e;
| ~~

warning: never type fallback affects this call to an `unsafe` function
--> tests/ui-stable/transmute-ref-src-dst-not-references.rs:17:39
|
17 | const SRC_DST_NOT_REFERENCES: usize = transmute_ref!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this will change its meaning in a future release!
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the type explicitly
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
Expand All @@ -112,7 +117,7 @@ warning: never type fallback affects this call to an `unsafe` function
17 | const SRC_DST_NOT_REFERENCES: usize = transmute_ref!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this will change its meaning in a future release!
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the type explicitly
= note: this warning originates in the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)
6 changes: 3 additions & 3 deletions tests/ui-stable/transmute-ref-src-dst-unsized.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ error[E0277]: the size for values of type `[u8]` cannot be known at compilation
|
= help: the trait `Sized` is not implemented for `[u8]`
note: required by an implicit `Sized` bound in `std::intrinsics::transmute`
--> $RUST/core/src/intrinsics.rs
--> $RUST/core/src/intrinsics/mod.rs
|
| pub fn transmute<Src, Dst>(src: Src) -> Dst;
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
| pub const unsafe fn transmute<Src, Dst>(_src: Src) -> Dst {
| ^^^ required by the implicit `Sized` requirement on this type parameter in `transmute`
= note: this error 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)

error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
Expand Down
11 changes: 8 additions & 3 deletions tests/ui-stable/transmute-ref-src-not-a-reference.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ warning: this function depends on never type fallback being `()`
17 | const SRC_NOT_A_REFERENCE: &u8 = transmute_ref!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= 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!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the types explicitly
note: in edition 2024, the requirement `!: IntoBytes` will fail
Expand All @@ -30,14 +30,19 @@ note: in edition 2024, the requirement `!: IntoBytes` will fail
| ^^^^^^^^^^^^^^^^^^^^^^
= note: `#[warn(dependency_on_unit_never_type_fallback)]` on by default
= note: this warning originates in the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)
help: use `()` annotations to avoid fallback changes
--> src/macros.rs
|
| let e: &() = $e;
| ~~

warning: never type fallback affects this call to an `unsafe` function
--> tests/ui-stable/transmute-ref-src-not-a-reference.rs:17:34
|
17 | const SRC_NOT_A_REFERENCE: &u8 = transmute_ref!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this will change its meaning in a future release!
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the type explicitly
= note: `#[warn(never_type_fallback_flowing_into_unsafe)]` on by default
Expand All @@ -49,7 +54,7 @@ warning: never type fallback affects this call to an `unsafe` function
17 | const SRC_NOT_A_REFERENCE: &u8 = transmute_ref!(0usize);
| ^^^^^^^^^^^^^^^^^^^^^^
|
= warning: this will change its meaning in a future release!
= warning: this changes meaning in Rust 2024 and in a future release in all editions!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the type explicitly
= note: this warning originates in the macro `transmute_ref` (in Nightly builds, run with -Z macro-backtrace for more info)
Loading

0 comments on commit 98b95d3

Please sign in to comment.