From 715b592131474e824f61380bfc0f5dd254b72d7e Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Wed, 3 Apr 2024 23:14:23 -0700 Subject: [PATCH] Fix UI tests Signed-off-by: Joe Richey --- .../ui-nightly/include_value_not_from_bytes.stderr | 2 +- .../ui-nightly/transmute-dst-not-frombytes.stderr | 2 +- .../transmute-mut-dst-not-frombytes.stderr | 2 +- .../transmute-mut-dst-not-intobytes.stderr | 2 +- .../transmute-mut-src-not-frombytes.stderr | 4 ++-- .../transmute-mut-src-not-intobytes.stderr | 4 ++-- .../transmute-ref-dst-not-frombytes.stderr | 2 +- .../transmute-ref-src-not-intobytes.stderr | 4 ++-- .../ui-nightly/transmute-src-not-intobytes.stderr | 4 ++-- .../tests/ui-nightly/derive_transparent.stderr | 8 ++++---- .../tests/ui-nightly/late_compile_pass.stderr | 14 +++++++------- zerocopy-derive/tests/ui-nightly/struct.stderr | 4 ++-- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/ui-nightly/include_value_not_from_bytes.stderr b/tests/ui-nightly/include_value_not_from_bytes.stderr index 2f96227a64..7974607ecb 100644 --- a/tests/ui-nightly/include_value_not_from_bytes.stderr +++ b/tests/ui-nightly/include_value_not_from_bytes.stderr @@ -10,9 +10,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not sat = help: the following other types implement trait `zerocopy::FromBytes`: () AU16 - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 diff --git a/tests/ui-nightly/transmute-dst-not-frombytes.stderr b/tests/ui-nightly/transmute-dst-not-frombytes.stderr index 0567fd3ba8..8c90c2bd45 100644 --- a/tests/ui-nightly/transmute-dst-not-frombytes.stderr +++ b/tests/ui-nightly/transmute-dst-not-frombytes.stderr @@ -10,9 +10,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not satisfie = help: the following other types implement trait `zerocopy::FromBytes`: () AU16 - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 diff --git a/tests/ui-nightly/transmute-mut-dst-not-frombytes.stderr b/tests/ui-nightly/transmute-mut-dst-not-frombytes.stderr index 6c2ba0d290..b92f2eadc2 100644 --- a/tests/ui-nightly/transmute-mut-dst-not-frombytes.stderr +++ b/tests/ui-nightly/transmute-mut-dst-not-frombytes.stderr @@ -9,9 +9,9 @@ error[E0277]: the trait bound `Dst: FromBytes` is not satisfied | = help: the following other types implement trait `FromBytes`: () - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 diff --git a/tests/ui-nightly/transmute-mut-dst-not-intobytes.stderr b/tests/ui-nightly/transmute-mut-dst-not-intobytes.stderr index 49991c14ff..9702273272 100644 --- a/tests/ui-nightly/transmute-mut-dst-not-intobytes.stderr +++ b/tests/ui-nightly/transmute-mut-dst-not-intobytes.stderr @@ -12,10 +12,10 @@ error[E0277]: the trait bound `Dst: IntoBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 - AtomicU32 and $N others note: required by a bound in `AssertDstIsIntoBytes` --> tests/ui-nightly/transmute-mut-dst-not-intobytes.rs:24:36 diff --git a/tests/ui-nightly/transmute-mut-src-not-frombytes.stderr b/tests/ui-nightly/transmute-mut-src-not-frombytes.stderr index 860cc180e4..88258f36d8 100644 --- a/tests/ui-nightly/transmute-mut-src-not-frombytes.stderr +++ b/tests/ui-nightly/transmute-mut-src-not-frombytes.stderr @@ -9,9 +9,9 @@ error[E0277]: the trait bound `Src: FromBytes` is not satisfied | = help: the following other types implement trait `FromBytes`: () - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 @@ -32,9 +32,9 @@ error[E0277]: the trait bound `Src: FromBytes` is not satisfied | = help: the following other types implement trait `FromBytes`: () - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 diff --git a/tests/ui-nightly/transmute-mut-src-not-intobytes.stderr b/tests/ui-nightly/transmute-mut-src-not-intobytes.stderr index 5907bad499..c47004d8c0 100644 --- a/tests/ui-nightly/transmute-mut-src-not-intobytes.stderr +++ b/tests/ui-nightly/transmute-mut-src-not-intobytes.stderr @@ -12,10 +12,10 @@ error[E0277]: the trait bound `Src: IntoBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 - AtomicU32 and $N others note: required by a bound in `AssertSrcIsIntoBytes` --> tests/ui-nightly/transmute-mut-src-not-intobytes.rs:24:36 @@ -35,10 +35,10 @@ error[E0277]: the trait bound `Src: IntoBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 - AtomicU32 and $N others note: required by a bound in `AssertSrcIsIntoBytes` --> tests/ui-nightly/transmute-mut-src-not-intobytes.rs:24:36 diff --git a/tests/ui-nightly/transmute-ref-dst-not-frombytes.stderr b/tests/ui-nightly/transmute-ref-dst-not-frombytes.stderr index 5b89403f1e..c1a638f299 100644 --- a/tests/ui-nightly/transmute-ref-dst-not-frombytes.stderr +++ b/tests/ui-nightly/transmute-ref-dst-not-frombytes.stderr @@ -10,9 +10,9 @@ error[E0277]: the trait bound `Dst: zerocopy::FromBytes` is not satisfied = help: the following other types implement trait `zerocopy::FromBytes`: () AU16 - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 diff --git a/tests/ui-nightly/transmute-ref-src-not-intobytes.stderr b/tests/ui-nightly/transmute-ref-src-not-intobytes.stderr index 8cac27acc3..7085623417 100644 --- a/tests/ui-nightly/transmute-ref-src-not-intobytes.stderr +++ b/tests/ui-nightly/transmute-ref-src-not-intobytes.stderr @@ -13,9 +13,9 @@ error[E0277]: the trait bound `Src: zerocopy::IntoBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize - AtomicU16 and $N others note: required by a bound in `AssertSrcIsIntoBytes` --> tests/ui-nightly/transmute-ref-src-not-intobytes.rs:23:33 @@ -36,9 +36,9 @@ error[E0277]: the trait bound `Src: zerocopy::IntoBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize - AtomicU16 and $N others note: required by a bound in `AssertSrcIsIntoBytes` --> tests/ui-nightly/transmute-ref-src-not-intobytes.rs:23:33 diff --git a/tests/ui-nightly/transmute-src-not-intobytes.stderr b/tests/ui-nightly/transmute-src-not-intobytes.stderr index 110a8e7583..54d16e1e49 100644 --- a/tests/ui-nightly/transmute-src-not-intobytes.stderr +++ b/tests/ui-nightly/transmute-src-not-intobytes.stderr @@ -13,9 +13,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::IntoBytes` is not sa AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize - AtomicU16 and $N others note: required by a bound in `AssertIsIntoBytes` --> tests/ui-nightly/transmute-src-not-intobytes.rs:19:32 @@ -36,9 +36,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::IntoBytes` is not sa AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize - AtomicU16 and $N others note: required by a bound in `AssertIsIntoBytes` --> tests/ui-nightly/transmute-src-not-intobytes.rs:19:32 diff --git a/zerocopy-derive/tests/ui-nightly/derive_transparent.stderr b/zerocopy-derive/tests/ui-nightly/derive_transparent.stderr index 4db7cf96c3..822cc3860b 100644 --- a/zerocopy-derive/tests/ui-nightly/derive_transparent.stderr +++ b/zerocopy-derive/tests/ui-nightly/derive_transparent.stderr @@ -12,7 +12,7 @@ error[E0277]: the trait bound `NotZerocopy: TryFromBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others note: required for `TransparentStruct` to implement `TryFromBytes` --> tests/ui-nightly/derive_transparent.rs:24:21 @@ -40,7 +40,7 @@ error[E0277]: the trait bound `NotZerocopy: FromZeros` is not satisfied AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others note: required for `TransparentStruct` to implement `FromZeros` --> tests/ui-nightly/derive_transparent.rs:24:21 @@ -63,9 +63,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not satisfie = help: the following other types implement trait `zerocopy::FromBytes`: () AU16 - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 @@ -94,9 +94,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::IntoBytes` is not satisfie AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize - AtomicU16 and $N others note: required for `TransparentStruct` to implement `zerocopy::IntoBytes` --> tests/ui-nightly/derive_transparent.rs:24:10 diff --git a/zerocopy-derive/tests/ui-nightly/late_compile_pass.stderr b/zerocopy-derive/tests/ui-nightly/late_compile_pass.stderr index ef1d79ce5b..fbfc567600 100644 --- a/zerocopy-derive/tests/ui-nightly/late_compile_pass.stderr +++ b/zerocopy-derive/tests/ui-nightly/late_compile_pass.stderr @@ -20,7 +20,7 @@ error[E0277]: the trait bound `NotZerocopy: TryFromBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others = help: see issue #48214 = note: this error originates in the derive macro `TryFromBytes` (in Nightly builds, run with -Z macro-backtrace for more info) @@ -43,7 +43,7 @@ error[E0277]: the trait bound `NotZerocopy: TryFromBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others = help: see issue #48214 = note: this error originates in the derive macro `FromZeros` (in Nightly builds, run with -Z macro-backtrace for more info) @@ -66,7 +66,7 @@ error[E0277]: the trait bound `NotZerocopy: FromZeros` is not satisfied AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others = help: see issue #48214 = note: this error originates in the derive macro `FromZeros` (in Nightly builds, run with -Z macro-backtrace for more info) @@ -89,7 +89,7 @@ error[E0277]: the trait bound `NotZerocopy: TryFromBytes` is not satisfied AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others = help: see issue #48214 = note: this error originates in the derive macro `FromBytes` (in Nightly builds, run with -Z macro-backtrace for more info) @@ -112,7 +112,7 @@ error[E0277]: the trait bound `NotZerocopy: FromZeros` is not satisfied AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others = help: see issue #48214 = note: this error originates in the derive macro `FromBytes` (in Nightly builds, run with -Z macro-backtrace for more info) @@ -130,9 +130,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not satisfie = help: the following other types implement trait `zerocopy::FromBytes`: () AU16 - AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize AtomicU16 @@ -156,9 +156,9 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::IntoBytes` is not satisfie AtomicBool AtomicI16 AtomicI32 + AtomicI64 AtomicI8 AtomicIsize - AtomicU16 and $N others = help: see issue #48214 = note: this error originates in the derive macro `IntoBytes` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/zerocopy-derive/tests/ui-nightly/struct.stderr b/zerocopy-derive/tests/ui-nightly/struct.stderr index 54b5c82741..3656a094eb 100644 --- a/zerocopy-derive/tests/ui-nightly/struct.stderr +++ b/zerocopy-derive/tests/ui-nightly/struct.stderr @@ -86,7 +86,7 @@ error[E0277]: the trait bound `NotKnownLayoutDst: zerocopy::KnownLayout` is not AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others = help: see issue #48214 = note: this error originates in the derive macro `KnownLayout` (in Nightly builds, run with -Z macro-backtrace for more info) @@ -109,7 +109,7 @@ error[E0277]: the trait bound `NotKnownLayout: zerocopy::KnownLayout` is not sat AtomicBool AtomicI16 AtomicI32 - AtomicI8 + AtomicI64 and $N others = help: see issue #48214 = note: this error originates in the derive macro `KnownLayout` (in Nightly builds, run with -Z macro-backtrace for more info)