[ci] Update pinned toolchain versions

Also rename `tests/ui` to `tests/ui-nightly` since it now only contains nightly tests (it used to also contain beta tests when we tested on beta in CI). Same for zerocopy-derive.
google · May 25, 2023 · 566962c · 566962c
1 parent 95a8c0e
commit 566962c
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 38 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,8 +25,8 @@ all-features = true
 
 [package.metadata.ci]
 # The versions of the stable and nightly compiler toolchains to use in CI.
-pinned-stable = "1.65.0"
-pinned-nightly = "nightly-2022-11-04"
+pinned-stable = "1.69.0"
+pinned-nightly = "nightly-2023-05-25"
 
 [features]
 default = ["byteorder"]

diff --git a/tests/trybuild.rs b/tests/trybuild.rs
@@ -8,15 +8,15 @@
 // pin to specific versions in CI (a specific stable version, a specific date of
 // the nightly compiler, and a specific MSRV). Updating those pinned versions
 // may also require updating these tests.
-// - `tests/ui` - Contains the source of truth for our UI test source files
-//   (`.rs`), and contains `.err` and `.out` files for nightly and beta
+// - `tests/ui-nightly` - Contains the source of truth for our UI test source
+//   files (`.rs`), and contains `.err` and `.out` files for nightly
 // - `tests/ui-stable` - Contains symlinks to the `.rs` files in `tests/ui`, and
 //   contains `.err` and `.out` files for stable
 // - `tests/ui-msrv` - Contains symlinks to the `.rs` files in `tests/ui`, and
 //   contains `.err` and `.out` files for MSRV
 
-#[rustversion::any(nightly, beta)]
-const SOURCE_FILES_GLOB: &str = "tests/ui/*.rs";
+#[rustversion::any(nightly)]
+const SOURCE_FILES_GLOB: &str = "tests/ui-nightly/*.rs";
 #[rustversion::all(stable, not(stable(1.65.0)))]
 const SOURCE_FILES_GLOB: &str = "tests/ui-stable/*.rs";
 #[rustversion::stable(1.65.0)]

diff --git a/tests/ui/transmute-illegal.rs → tests/ui-nightly/transmute-illegal.rs b/tests/ui/transmute-illegal.rs → tests/ui-nightly/transmute-illegal.rs
diff --git a/tests/ui/transmute-illegal.stderr → tests/ui-nightly/transmute-illegal.stderr b/tests/ui/transmute-illegal.stderr → tests/ui-nightly/transmute-illegal.stderr
@@ -7,19 +7,10 @@ error[E0277]: the trait bound `*const usize: AsBytes` is not satisfied
    |                              the trait `AsBytes` is not implemented for `*const usize`
    |                              required by a bound introduced by this call
    |
-   = help: the following other types implement trait `AsBytes`:
-             f32
-             f64
-             i128
-             i16
-             i32
-             i64
-             i8
-             isize
-           and $N others
+   = help: the trait `AsBytes` is implemented for `usize`
 note: required by a bound in `POINTER_VALUE::transmute`
   --> tests/ui/transmute-illegal.rs:10:30
    |
 10 | const POINTER_VALUE: usize = zerocopy::transmute!(&0usize as *const usize);
-   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `POINTER_VALUE::transmute`
+   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `transmute`
    = note: this error originates in the macro `zerocopy::transmute` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui-stable/transmute-illegal.stderr b/tests/ui-stable/transmute-illegal.stderr
@@ -12,5 +12,5 @@ note: required by a bound in `POINTER_VALUE::transmute`
   --> tests/ui-stable/transmute-illegal.rs:10:30
    |
 10 | const POINTER_VALUE: usize = zerocopy::transmute!(&0usize as *const usize);
-   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `POINTER_VALUE::transmute`
+   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `transmute`
    = note: this error originates in the macro `zerocopy::transmute` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/zerocopy-derive/tests/trybuild.rs b/zerocopy-derive/tests/trybuild.rs
@@ -8,15 +8,15 @@
 // pin to specific versions in CI (a specific stable version, a specific date of
 // the nightly compiler, and a specific MSRV). Updating those pinned versions
 // may also require updating these tests.
-// - `tests/ui` - Contains the source of truth for our UI test source files
-//   (`.rs`), and contains `.err` and `.out` files for nightly and beta
+// - `tests/ui-nightly` - Contains the source of truth for our UI test source
+//   files (`.rs`), and contains `.err` and `.out` files for nightly
 // - `tests/ui-stable` - Contains symlinks to the `.rs` files in `tests/ui`, and
 //   contains `.err` and `.out` files for stable
 // - `tests/ui-msrv` - Contains symlinks to the `.rs` files in `tests/ui`, and
 //   contains `.err` and `.out` files for MSRV
 
-#[rustversion::any(nightly, beta)]
-const SOURCE_FILES_GLOB: &str = "tests/ui/*.rs";
+#[rustversion::any(nightly)]
+const SOURCE_FILES_GLOB: &str = "tests/ui-nightly/*.rs";
 #[rustversion::all(stable, not(stable(1.65.0)))]
 const SOURCE_FILES_GLOB: &str = "tests/ui-stable/*.rs";
 #[rustversion::stable(1.65.0)]

diff --git a/...opy-derive/tests/ui/derive_transparent.rs → ...ve/tests/ui-nightly/derive_transparent.rs b/...opy-derive/tests/ui/derive_transparent.rs → ...ve/tests/ui-nightly/derive_transparent.rs
diff --git a/...derive/tests/ui/derive_transparent.stderr → ...ests/ui-nightly/derive_transparent.stderr b/...derive/tests/ui/derive_transparent.stderr → ...ests/ui-nightly/derive_transparent.stderr
@@ -18,12 +18,12 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `FromZeroes`
   --> tests/ui/derive_transparent.rs:23:19
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |                   ^^^^^^^^^^
+   |                   ^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui/derive_transparent.rs:33:1
    |
 33 | assert_impl_all!(TransparentStruct<NotZerocopy>: FromZeroes);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `FromZeroes` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NotZerocopy: FromBytes` is not satisfied
@@ -46,12 +46,12 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `FromBytes`
   --> tests/ui/derive_transparent.rs:23:31
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |                               ^^^^^^^^^
+   |                               ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui/derive_transparent.rs:34:1
    |
 34 | assert_impl_all!(TransparentStruct<NotZerocopy>: FromBytes);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `FromBytes` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NotZerocopy: AsBytes` is not satisfied
@@ -74,12 +74,12 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `AsBytes`
   --> tests/ui/derive_transparent.rs:23:10
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |          ^^^^^^^
+   |          ^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui/derive_transparent.rs:35:1
    |
 35 | assert_impl_all!(TransparentStruct<NotZerocopy>: AsBytes);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `AsBytes` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NotZerocopy: Unaligned` is not satisfied
@@ -102,10 +102,10 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `Unaligned`
   --> tests/ui/derive_transparent.rs:23:42
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |                                          ^^^^^^^^^
+   |                                          ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui/derive_transparent.rs:36:1
    |
 36 | assert_impl_all!(TransparentStruct<NotZerocopy>: Unaligned);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `Unaligned` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/zerocopy-derive/tests/ui/enum.rs → zerocopy-derive/tests/ui-nightly/enum.rs b/zerocopy-derive/tests/ui/enum.rs → zerocopy-derive/tests/ui-nightly/enum.rs
diff --git a/zerocopy-derive/tests/ui/enum.stderr → zerocopy-derive/tests/ui-nightly/enum.stderr b/zerocopy-derive/tests/ui/enum.stderr → zerocopy-derive/tests/ui-nightly/enum.stderr
diff --git a/...i/enum_from_bytes_u16_too_few.rs.disabled → ...y/enum_from_bytes_u16_too_few.rs.disabled b/...i/enum_from_bytes_u16_too_few.rs.disabled → ...y/enum_from_bytes_u16_too_few.rs.disabled
diff --git a/...ve/tests/ui/enum_from_bytes_u8_too_few.rs → .../ui-nightly/enum_from_bytes_u8_too_few.rs b/...ve/tests/ui/enum_from_bytes_u8_too_few.rs → .../ui-nightly/enum_from_bytes_u8_too_few.rs
diff --git a/...ests/ui/enum_from_bytes_u8_too_few.stderr → ...nightly/enum_from_bytes_u8_too_few.stderr b/...ests/ui/enum_from_bytes_u8_too_few.stderr → ...nightly/enum_from_bytes_u8_too_few.stderr
diff --git a/...copy-derive/tests/ui/late_compile_pass.rs → ...ive/tests/ui-nightly/late_compile_pass.rs b/...copy-derive/tests/ui/late_compile_pass.rs → ...ive/tests/ui-nightly/late_compile_pass.rs
diff --git a/...-derive/tests/ui/late_compile_pass.stderr → ...tests/ui-nightly/late_compile_pass.stderr b/...-derive/tests/ui/late_compile_pass.stderr → ...tests/ui-nightly/late_compile_pass.stderr
diff --git a/zerocopy-derive/tests/ui/struct.rs → zerocopy-derive/tests/ui-nightly/struct.rs b/zerocopy-derive/tests/ui/struct.rs → zerocopy-derive/tests/ui-nightly/struct.rs
diff --git a/zerocopy-derive/tests/ui/struct.stderr → ...opy-derive/tests/ui-nightly/struct.stderr b/zerocopy-derive/tests/ui/struct.stderr → ...opy-derive/tests/ui-nightly/struct.stderr
diff --git a/zerocopy-derive/tests/ui/union.rs → zerocopy-derive/tests/ui-nightly/union.rs b/zerocopy-derive/tests/ui/union.rs → zerocopy-derive/tests/ui-nightly/union.rs
diff --git a/zerocopy-derive/tests/ui/union.stderr → ...copy-derive/tests/ui-nightly/union.stderr b/zerocopy-derive/tests/ui/union.stderr → ...copy-derive/tests/ui-nightly/union.stderr
diff --git a/zerocopy-derive/tests/ui-stable/derive_transparent.stderr b/zerocopy-derive/tests/ui-stable/derive_transparent.stderr
@@ -18,12 +18,12 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `FromZeroes`
   --> tests/ui-stable/derive_transparent.rs:23:19
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |                   ^^^^^^^^^^
+   |                   ^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui-stable/derive_transparent.rs:33:1
    |
 33 | assert_impl_all!(TransparentStruct<NotZerocopy>: FromZeroes);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `FromZeroes` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NotZerocopy: FromBytes` is not satisfied
@@ -46,12 +46,12 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `FromBytes`
   --> tests/ui-stable/derive_transparent.rs:23:31
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |                               ^^^^^^^^^
+   |                               ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui-stable/derive_transparent.rs:34:1
    |
 34 | assert_impl_all!(TransparentStruct<NotZerocopy>: FromBytes);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `FromBytes` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NotZerocopy: AsBytes` is not satisfied
@@ -74,12 +74,12 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `AsBytes`
   --> tests/ui-stable/derive_transparent.rs:23:10
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |          ^^^^^^^
+   |          ^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui-stable/derive_transparent.rs:35:1
    |
 35 | assert_impl_all!(TransparentStruct<NotZerocopy>: AsBytes);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `AsBytes` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NotZerocopy: Unaligned` is not satisfied
@@ -102,10 +102,10 @@ note: required for `TransparentStruct<NotZerocopy>` to implement `Unaligned`
   --> tests/ui-stable/derive_transparent.rs:23:42
    |
 23 | #[derive(AsBytes, FromZeroes, FromBytes, Unaligned)]
-   |                                          ^^^^^^^^^
+   |                                          ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::{closure#0}::assert_impl_all`
   --> tests/ui-stable/derive_transparent.rs:36:1
    |
 36 | assert_impl_all!(TransparentStruct<NotZerocopy>: Unaligned);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `_::{closure#0}::assert_impl_all`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
    = note: this error originates in the derive macro `Unaligned` which comes from the expansion of the macro `assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)