html-to-markdown 2.23.4 → 2.24.1

data/rust-vendor/zerocopy/tests/ui-nightly/diagnostic-not-implemented-issue-1296.stderr

@@ -1,38 +1,38 @@
-error[E0277]: the trait bound `NotZerocopy: zerocopy::Immutable` is not satisfied
-  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:52:19
+error[E0277]: the trait bound `NotZerocopy: Immutable` is not satisfied
+  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:50:19
    |
-52 |     Foo.write_obj(NotZerocopy(()));
-   |         --------- ^^^^^^^^^^^^^^^ the trait `zerocopy::Immutable` is not implemented for `NotZerocopy`
+50 |     Foo.write_obj(NotZerocopy(()));
+   |         --------- ^^^^^^^^^^^^^^^ the trait `Immutable` is not implemented for `NotZerocopy`
    |         |
    |         required by a bound introduced by this call
    |
 note: required by a bound in `Foo::write_obj`
-  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:58:21
+  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:56:21
    |
-58 |     fn write_obj<T: Immutable + IntoBytes>(&mut self, _val: T) {}
+56 |     fn write_obj<T: Immutable + IntoBytes>(&mut self, _val: T) {}
    |                     ^^^^^^^^^ required by this bound in `Foo::write_obj`
 help: consider borrowing here
    |
-52 |     Foo.write_obj(&NotZerocopy(()));
+50 |     Foo.write_obj(&NotZerocopy(()));
    |                   +
-52 |     Foo.write_obj(&mut NotZerocopy(()));
+50 |     Foo.write_obj(&mut NotZerocopy(()));
    |                   ++++
 
-error[E0277]: the trait bound `NotZerocopy: zerocopy::IntoBytes` is not satisfied
-  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:52:19
+error[E0277]: the trait bound `NotZerocopy: IntoBytes` is not satisfied
+  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:50:19
    |
-52 |     Foo.write_obj(NotZerocopy(()));
+50 |     Foo.write_obj(NotZerocopy(()));
    |         --------- ^^^^^^^^^^^^^^^ unsatisfied trait bound
    |         |
    |         required by a bound introduced by this call
    |
-help: the trait `zerocopy::IntoBytes` is not implemented for `NotZerocopy`
-  --> tests/ui-nightly/../../zerocopy-derive/tests/include.rs
+help: the trait `IntoBytes` is not implemented for `NotZerocopy`
+  --> tests/ui-nightly/../include.rs
    |
    |     pub struct NotZerocopy<T = ()>(pub T);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: Consider adding `#[derive(IntoBytes)]` to `NotZerocopy`
-   = help: the following other types implement trait `zerocopy::IntoBytes`:
+   = help: the following other types implement trait `IntoBytes`:
              ()
              AU16
              AtomicBool
@@ -43,7 +43,7 @@ help: the trait `zerocopy::IntoBytes` is not implemented for `NotZerocopy`
              AtomicIsize
            and $N others
 note: required by a bound in `Foo::write_obj`
-  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:58:33
+  --> tests/ui-nightly/diagnostic-not-implemented-issue-1296.rs:56:33
    |
-58 |     fn write_obj<T: Immutable + IntoBytes>(&mut self, _val: T) {}
+56 |     fn write_obj<T: Immutable + IntoBytes>(&mut self, _val: T) {}
    |                                 ^^^^^^^^^ required by this bound in `Foo::write_obj`

data/rust-vendor/zerocopy/tests/ui-nightly/diagnostic-not-implemented-known-layout.rs

@@ -6,9 +6,7 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-include!("../../zerocopy-derive/tests/include.rs");
-
-extern crate zerocopy;
+include!("../include.rs");
 
 use util::NotZerocopy;
 use zerocopy::KnownLayout;

data/rust-vendor/zerocopy/tests/ui-nightly/diagnostic-not-implemented-known-layout.stderr

@@ -1,16 +1,16 @@
-error[E0277]: the trait bound `NotZerocopy: zerocopy::KnownLayout` is not satisfied
-  --> tests/ui-nightly/diagnostic-not-implemented-known-layout.rs:18:26
+error[E0277]: the trait bound `NotZerocopy: KnownLayout` is not satisfied
+  --> tests/ui-nightly/diagnostic-not-implemented-known-layout.rs:16:26
    |
-18 |     takes_known_layout::<NotZerocopy>();
+16 |     takes_known_layout::<NotZerocopy>();
    |                          ^^^^^^^^^^^ unsatisfied trait bound
    |
-help: the trait `zerocopy::KnownLayout` is not implemented for `NotZerocopy`
-  --> tests/ui-nightly/../../zerocopy-derive/tests/include.rs
+help: the trait `KnownLayout` is not implemented for `NotZerocopy`
+  --> tests/ui-nightly/../include.rs
    |
    |     pub struct NotZerocopy<T = ()>(pub T);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: Consider adding `#[derive(KnownLayout)]` to `NotZerocopy`
-   = help: the following other types implement trait `zerocopy::KnownLayout`:
+   = help: the following other types implement trait `KnownLayout`:
              &T
              &mut T
              ()
@@ -21,7 +21,7 @@ help: the trait `zerocopy::KnownLayout` is not implemented for `NotZerocopy`
              AtomicI16
            and $N others
 note: required by a bound in `takes_known_layout`
-  --> tests/ui-nightly/diagnostic-not-implemented-known-layout.rs:21:26
+  --> tests/ui-nightly/diagnostic-not-implemented-known-layout.rs:19:26
    |
-21 | fn takes_known_layout<T: KnownLayout>() {}
+19 | fn takes_known_layout<T: KnownLayout>() {}
    |                          ^^^^^^^^^^^ required by this bound in `takes_known_layout`

data/rust-vendor/zerocopy/tests/ui-nightly/diagnostic-not-implemented-try-from-bytes.rs

@@ -6,9 +6,7 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-include!("../../zerocopy-derive/tests/include.rs");
-
-extern crate zerocopy;
+include!("../include.rs");
 
 use util::NotZerocopy;
 use zerocopy::TryFromBytes;

data/rust-vendor/zerocopy/tests/ui-nightly/diagnostic-not-implemented-try-from-bytes.stderr

@@ -1,27 +1,27 @@
-error[E0277]: the trait bound `NotZerocopy: zerocopy::TryFromBytes` is not satisfied
-  --> tests/ui-nightly/diagnostic-not-implemented-try-from-bytes.rs:18:28
+error[E0277]: the trait bound `NotZerocopy: TryFromBytes` is not satisfied
+  --> tests/ui-nightly/diagnostic-not-implemented-try-from-bytes.rs:16:28
    |
-18 |     takes_try_from_bytes::<NotZerocopy>();
+16 |     takes_try_from_bytes::<NotZerocopy>();
    |                            ^^^^^^^^^^^ unsatisfied trait bound
    |
-help: the trait `zerocopy::TryFromBytes` is not implemented for `NotZerocopy`
-  --> tests/ui-nightly/../../zerocopy-derive/tests/include.rs
+help: the trait `TryFromBytes` is not implemented for `NotZerocopy`
+  --> tests/ui-nightly/../include.rs
    |
    |     pub struct NotZerocopy<T = ()>(pub T);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: Consider adding `#[derive(TryFromBytes)]` to `NotZerocopy`
-   = help: the following other types implement trait `zerocopy::TryFromBytes`:
+   = help: the following other types implement trait `TryFromBytes`:
              ()
-             *const T
-             *mut T
-             AU16
-             AtomicBool
-             AtomicI16
-             AtomicI32
-             AtomicI64
+             (A, B)
+             (A, B, C)
+             (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
            and $N others
 note: required by a bound in `takes_try_from_bytes`
-  --> tests/ui-nightly/diagnostic-not-implemented-try-from-bytes.rs:21:28
+  --> tests/ui-nightly/diagnostic-not-implemented-try-from-bytes.rs:19:28
    |
-21 | fn takes_try_from_bytes<T: TryFromBytes>() {}
+19 | fn takes_try_from_bytes<T: TryFromBytes>() {}
    |                            ^^^^^^^^^^^^ required by this bound in `takes_try_from_bytes`

data/rust-vendor/zerocopy/tests/ui-nightly/diagnostic-not-implemented-unaligned.rs

@@ -6,9 +6,7 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-include!("../../zerocopy-derive/tests/include.rs");
-
-extern crate zerocopy;
+include!("../include.rs");
 
 use util::NotZerocopy;
 use zerocopy::Unaligned;

data/rust-vendor/zerocopy/tests/ui-nightly/diagnostic-not-implemented-unaligned.stderr

@@ -1,11 +1,11 @@
 error[E0277]: the trait bound `NotZerocopy: zerocopy::Unaligned` is not satisfied
-  --> tests/ui-nightly/diagnostic-not-implemented-unaligned.rs:18:23
+  --> tests/ui-nightly/diagnostic-not-implemented-unaligned.rs:16:23
    |
-18 |     takes_unaligned::<NotZerocopy>();
+16 |     takes_unaligned::<NotZerocopy>();
    |                       ^^^^^^^^^^^ unsatisfied trait bound
    |
 help: the trait `zerocopy::Unaligned` is not implemented for `NotZerocopy`
-  --> tests/ui-nightly/../../zerocopy-derive/tests/include.rs
+  --> tests/ui-nightly/../include.rs
    |
    |     pub struct NotZerocopy<T = ()>(pub T);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -21,7 +21,7 @@ help: the trait `zerocopy::Unaligned` is not implemented for `NotZerocopy`
              I128<O>
            and $N others
 note: required by a bound in `takes_unaligned`
-  --> tests/ui-nightly/diagnostic-not-implemented-unaligned.rs:21:23
+  --> tests/ui-nightly/diagnostic-not-implemented-unaligned.rs:19:23
    |
-21 | fn takes_unaligned<T: Unaligned>() {}
+19 | fn takes_unaligned<T: Unaligned>() {}
    |                       ^^^^^^^^^ required by this bound in `takes_unaligned`

data/rust-vendor/zerocopy/tests/ui-nightly/include_value_not_from_bytes.rs

@@ -6,14 +6,12 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-include!("../../zerocopy-derive/tests/include.rs");
-
-#[macro_use]
-extern crate zerocopy;
+include!("../include.rs");
 
 use util::NotZerocopy;
 
 fn main() {}
 
 // Should fail because `NotZerocopy<u32>: !FromBytes`.
-const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
+const NOT_FROM_BYTES: NotZerocopy<u32> =
+    zerocopy::include_value!("../../testdata/include_value/data");

data/rust-vendor/zerocopy/tests/ui-nightly/include_value_not_from_bytes.stderr

@@ -1,31 +1,31 @@
-error[E0277]: the trait bound `NotZerocopy<u32>: zerocopy::FromBytes` is not satisfied
-  --> tests/ui-nightly/include_value_not_from_bytes.rs:19:42
+error[E0277]: the trait bound `NotZerocopy<u32>: FromBytes` is not satisfied
+  --> tests/ui-nightly/include_value_not_from_bytes.rs:17:5
    |
-19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
-   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
+17 |     zerocopy::include_value!("../../testdata/include_value/data");
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
    |
-help: the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy<u32>`
-  --> tests/ui-nightly/../../zerocopy-derive/tests/include.rs
+help: the trait `FromBytes` is not implemented for `NotZerocopy<u32>`
+  --> tests/ui-nightly/../include.rs
    |
    |     pub struct NotZerocopy<T = ()>(pub T);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: Consider adding `#[derive(FromBytes)]` to `NotZerocopy<u32>`
-   = help: the following other types implement trait `zerocopy::FromBytes`:
+   = help: the following other types implement trait `FromBytes`:
              ()
-             AU16
-             AtomicI16
-             AtomicI32
-             AtomicI64
-             AtomicI8
-             AtomicIsize
-             AtomicU16
+             (A, B)
+             (A, B, C)
+             (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
            and $N others
 note: required by a bound in `NOT_FROM_BYTES::transmute`
-  --> tests/ui-nightly/include_value_not_from_bytes.rs:19:42
+  --> tests/ui-nightly/include_value_not_from_bytes.rs:17:5
    |
-19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
-   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |                                          |
-   |                                          required by a bound in this function
-   |                                          required by this bound in `transmute`
-   = note: this error originates in the macro `$crate::transmute` which comes from the expansion of the macro `include_value` (in Nightly builds, run with -Z macro-backtrace for more info)
+17 |     zerocopy::include_value!("../../testdata/include_value/data");
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |     |
+   |     required by a bound in this function
+   |     required by this bound in `transmute`
+   = note: this error originates in the macro `$crate::transmute` which comes from the expansion of the macro `zerocopy::include_value` (in Nightly builds, run with -Z macro-backtrace for more info)

data/rust-vendor/zerocopy/tests/ui-nightly/include_value_wrong_size.rs

@@ -6,10 +6,7 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-#[macro_use]
-extern crate zerocopy;
-
 fn main() {}
 
 // Should fail because the file is 4 bytes long, not 8.
-const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
+const WRONG_SIZE: u64 = zerocopy::include_value!("../../testdata/include_value/data");

data/rust-vendor/zerocopy/tests/ui-nightly/include_value_wrong_size.stderr

@@ -1,17 +1,17 @@
 error[E0080]: transmuting from 4-byte type to 8-byte type: `[u8; 4]` -> `u64`
-  --> tests/ui-nightly/include_value_wrong_size.rs:15:25
+  --> tests/ui-nightly/include_value_wrong_size.rs:12:25
    |
-15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
-   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `WRONG_SIZE` failed here
+12 | const WRONG_SIZE: u64 = zerocopy::include_value!("../../testdata/include_value/data");
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `WRONG_SIZE` failed here
    |
-   = note: this error originates in the macro `$crate::transmute` which comes from the expansion of the macro `include_value` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `$crate::transmute` which comes from the expansion of the macro `zerocopy::include_value` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
-  --> tests/ui-nightly/include_value_wrong_size.rs:15:25
+  --> tests/ui-nightly/include_value_wrong_size.rs:12:25
    |
-15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
-   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12 | const WRONG_SIZE: u64 = zerocopy::include_value!("../../testdata/include_value/data");
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: source type: `[u8; 4]` (32 bits)
    = note: target type: `u64` (64 bits)
-   = note: this error originates in the macro `$crate::transmute` which comes from the expansion of the macro `include_value` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `$crate::transmute` which comes from the expansion of the macro `zerocopy::include_value` (in Nightly builds, run with -Z macro-backtrace for more info)

data/rust-vendor/zerocopy/tests/ui-nightly/invalid-impls/invalid-impls.rs

@@ -9,7 +9,6 @@
 // Since some macros from `macros.rs` are unused.
 #![allow(unused)]
 
-extern crate zerocopy;
 extern crate zerocopy_derive;
 
 include!("../../../src/util/macros.rs");

data/rust-vendor/zerocopy/tests/ui-nightly/invalid-impls/invalid-impls.stderr

@@ -1,30 +1,14 @@
-warning: ambiguous glob re-exports
- --> tests/ui-nightly/invalid-impls/../../../src/util/macros.rs
-  |
-  | / macro_rules! define_cast {
-... |
-  | |     };
-  | | }
-  | |_^ the name `define_cast` in the macro namespace is first re-exported here
-  |
- ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:17:5
-  |
- 17 |   use zerocopy::*;
-    |       ----------- but the name `define_cast` in the macro namespace is also re-exported here
-    |
-    = note: `#[warn(ambiguous_glob_reexports)]` on by default
-
 error[E0277]: the trait bound `T: zerocopy::TryFromBytes` is not satisfied
- --> tests/ui-nightly/invalid-impls/invalid-impls.rs:27:43
+ --> tests/ui-nightly/invalid-impls/invalid-impls.rs:26:43
   |
- 27 |     impl_or_verify!(T => TryFromBytes for Foo<T>);
+ 26 |     impl_or_verify!(T => TryFromBytes for Foo<T>);
     |                                           ^^^^^^ 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`
-   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:22:10
+   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:21:10
     |
- 22 | #[derive(FromBytes, IntoBytes, Unaligned)]
+ 21 | #[derive(FromBytes, IntoBytes, Unaligned)]
     |          ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::Subtrait`
    --> tests/ui-nightly/invalid-impls/../../../src/util/macros.rs
@@ -32,27 +16,27 @@ note: required by a bound in `_::Subtrait`
     |             trait Subtrait: $trait {}
     |                             ^^^^^^ required by this bound in `Subtrait`
     |
-   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:27:5
+   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:26:5
     |
- 27 |     impl_or_verify!(T => TryFromBytes for Foo<T>);
+ 26 |     impl_or_verify!(T => TryFromBytes for Foo<T>);
     |     --------------------------------------------- in this macro invocation
     = 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)
 help: consider restricting type parameter `T` with trait `TryFromBytes`
     |
- 27 |     impl_or_verify!(T: zerocopy::TryFromBytes => TryFromBytes for Foo<T>);
+ 26 |     impl_or_verify!(T: zerocopy::TryFromBytes => TryFromBytes for Foo<T>);
     |                      ++++++++++++++++++++++++
 
 error[E0277]: the trait bound `T: zerocopy::FromZeros` is not satisfied
- --> tests/ui-nightly/invalid-impls/invalid-impls.rs:28:40
+ --> tests/ui-nightly/invalid-impls/invalid-impls.rs:27:40
   |
- 28 |     impl_or_verify!(T => FromZeros for Foo<T>);
+ 27 |     impl_or_verify!(T => FromZeros for Foo<T>);
     |                                        ^^^^^^ 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`
-   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:22:10
+   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:21:10
     |
- 22 | #[derive(FromBytes, IntoBytes, Unaligned)]
+ 21 | #[derive(FromBytes, IntoBytes, Unaligned)]
     |          ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::Subtrait`
    --> tests/ui-nightly/invalid-impls/../../../src/util/macros.rs
@@ -60,27 +44,27 @@ note: required by a bound in `_::Subtrait`
     |             trait Subtrait: $trait {}
     |                             ^^^^^^ required by this bound in `Subtrait`
     |
-   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:28:5
+   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:27:5
     |
- 28 |     impl_or_verify!(T => FromZeros for Foo<T>);
+ 27 |     impl_or_verify!(T => FromZeros for Foo<T>);
     |     ------------------------------------------ in this macro invocation
     = 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)
 help: consider restricting type parameter `T` with trait `FromZeros`
     |
- 28 |     impl_or_verify!(T: zerocopy::FromZeros => FromZeros for Foo<T>);
+ 27 |     impl_or_verify!(T: zerocopy::FromZeros => FromZeros for Foo<T>);
     |                      +++++++++++++++++++++
 
 error[E0277]: the trait bound `T: zerocopy::FromBytes` is not satisfied
- --> tests/ui-nightly/invalid-impls/invalid-impls.rs:29:40
+ --> tests/ui-nightly/invalid-impls/invalid-impls.rs:28:40
   |
- 29 |     impl_or_verify!(T => FromBytes for Foo<T>);
+ 28 |     impl_or_verify!(T => FromBytes for Foo<T>);
     |                                        ^^^^^^ 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`
-   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:22:10
+   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:21:10
     |
- 22 | #[derive(FromBytes, IntoBytes, Unaligned)]
+ 21 | #[derive(FromBytes, IntoBytes, Unaligned)]
     |          ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::Subtrait`
    --> tests/ui-nightly/invalid-impls/../../../src/util/macros.rs
@@ -88,27 +72,27 @@ note: required by a bound in `_::Subtrait`
     |             trait Subtrait: $trait {}
     |                             ^^^^^^ required by this bound in `Subtrait`
     |
-   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:29:5
+   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:28:5
     |
- 29 |     impl_or_verify!(T => FromBytes for Foo<T>);
+ 28 |     impl_or_verify!(T => FromBytes for Foo<T>);
     |     ------------------------------------------ in this macro invocation
     = 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)
 help: consider restricting type parameter `T` with trait `FromBytes`
     |
- 29 |     impl_or_verify!(T: zerocopy::FromBytes => FromBytes for Foo<T>);
+ 28 |     impl_or_verify!(T: zerocopy::FromBytes => FromBytes for Foo<T>);
     |                      +++++++++++++++++++++
 
 error[E0277]: the trait bound `T: zerocopy::IntoBytes` is not satisfied
- --> tests/ui-nightly/invalid-impls/invalid-impls.rs:30:40
+ --> tests/ui-nightly/invalid-impls/invalid-impls.rs:29:40
   |
- 30 |     impl_or_verify!(T => IntoBytes for Foo<T>);
+ 29 |     impl_or_verify!(T => IntoBytes for Foo<T>);
     |                                        ^^^^^^ 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`
-   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:22:21
+   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:21:21
     |
- 22 | #[derive(FromBytes, IntoBytes, Unaligned)]
+ 21 | #[derive(FromBytes, IntoBytes, Unaligned)]
     |                     ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::Subtrait`
    --> tests/ui-nightly/invalid-impls/../../../src/util/macros.rs
@@ -116,27 +100,27 @@ note: required by a bound in `_::Subtrait`
     |             trait Subtrait: $trait {}
     |                             ^^^^^^ required by this bound in `Subtrait`
     |
-   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:30:5
+   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:29:5
     |
- 30 |     impl_or_verify!(T => IntoBytes for Foo<T>);
+ 29 |     impl_or_verify!(T => IntoBytes for Foo<T>);
     |     ------------------------------------------ in this macro invocation
     = 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)
 help: consider restricting type parameter `T` with trait `IntoBytes`
     |
- 30 |     impl_or_verify!(T: zerocopy::IntoBytes => IntoBytes for Foo<T>);
+ 29 |     impl_or_verify!(T: zerocopy::IntoBytes => IntoBytes for Foo<T>);
     |                      +++++++++++++++++++++
 
 error[E0277]: the trait bound `T: zerocopy::Unaligned` is not satisfied
- --> tests/ui-nightly/invalid-impls/invalid-impls.rs:31:40
+ --> tests/ui-nightly/invalid-impls/invalid-impls.rs:30:40
   |
- 31 |     impl_or_verify!(T => Unaligned for Foo<T>);
+ 30 |     impl_or_verify!(T => Unaligned for Foo<T>);
     |                                        ^^^^^^ 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`
-   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:22:32
+   --> tests/ui-nightly/invalid-impls/invalid-impls.rs:21:32
     |
- 22 | #[derive(FromBytes, IntoBytes, Unaligned)]
+ 21 | #[derive(FromBytes, IntoBytes, Unaligned)]
     |                                ^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `_::Subtrait`
    --> tests/ui-nightly/invalid-impls/../../../src/util/macros.rs
@@ -144,12 +128,12 @@ note: required by a bound in `_::Subtrait`
     |             trait Subtrait: $trait {}
     |                             ^^^^^^ required by this bound in `Subtrait`
     |
-   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:31:5
+   ::: tests/ui-nightly/invalid-impls/invalid-impls.rs:30:5
     |
- 31 |     impl_or_verify!(T => Unaligned for Foo<T>);
+ 30 |     impl_or_verify!(T => Unaligned for Foo<T>);
     |     ------------------------------------------ in this macro invocation
     = 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)
 help: consider restricting type parameter `T` with trait `Unaligned`
     |
- 31 |     impl_or_verify!(T: zerocopy::Unaligned => Unaligned for Foo<T>);
+ 30 |     impl_or_verify!(T: zerocopy::Unaligned => Unaligned for Foo<T>);
     |                      +++++++++++++++++++++

data/rust-vendor/zerocopy/tests/ui-nightly/ptr-is-invariant-over-v.stderr

@@ -10,7 +10,7 @@ error: lifetime may not live long enough
    |     ^^^^^^^^^^^^ assignment requires that `'small` must outlive `'big`
    |
    = help: consider adding the following bound: `'small: 'big`
-   = note: requirement occurs because of the type `Ptr<'_, &u32, (invariant::Exclusive, Aligned, Valid)>`, which makes the generic argument `&u32` invariant
+   = note: requirement occurs because of the type `Ptr<'_, &u32, (zerocopy::invariant::Exclusive, zerocopy::invariant::Aligned, zerocopy::invariant::Valid)>`, which makes the generic argument `&u32` invariant
    = note: the struct `Ptr<'a, T, I>` is invariant over the parameter `T`
    = help: see <https://doc.rust-lang.org/nomicon/subtyping.html> for more information about variance
 
@@ -26,6 +26,6 @@ error: lifetime may not live long enough
    |     ^^^^^^^^^^^^ assignment requires that `'small` must outlive `'big`
    |
    = help: consider adding the following bound: `'small: 'big`
-   = note: requirement occurs because of the type `Ptr<'_, &u32, (Shared, Aligned, Valid)>`, which makes the generic argument `&u32` invariant
+   = note: requirement occurs because of the type `Ptr<'_, &u32, (zerocopy::invariant::Shared, zerocopy::invariant::Aligned, zerocopy::invariant::Valid)>`, which makes the generic argument `&u32` invariant
    = note: the struct `Ptr<'a, T, I>` is invariant over the parameter `T`
    = help: see <https://doc.rust-lang.org/nomicon/subtyping.html> for more information about variance

data/rust-vendor/zerocopy/tests/ui-nightly/transmute-dst-not-frombytes.rs

@@ -6,9 +6,7 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-include!("../../zerocopy-derive/tests/include.rs");
-
-extern crate zerocopy;
+include!("../include.rs");
 
 use util::{NotZerocopy, AU16};
 use zerocopy::transmute;

data/rust-vendor/zerocopy/tests/ui-nightly/transmute-dst-not-frombytes.stderr

@@ -1,29 +1,29 @@
-error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not satisfied
-  --> tests/ui-nightly/transmute-dst-not-frombytes.rs:19:41
+error[E0277]: the trait bound `NotZerocopy: FromBytes` is not satisfied
+  --> tests/ui-nightly/transmute-dst-not-frombytes.rs:17:41
    |
-19 | const DST_NOT_FROM_BYTES: NotZerocopy = transmute!(AU16(0));
+17 | const DST_NOT_FROM_BYTES: NotZerocopy = transmute!(AU16(0));
    |                                         ^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
    |
-help: the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy`
-  --> tests/ui-nightly/../../zerocopy-derive/tests/include.rs
+help: the trait `FromBytes` is not implemented for `NotZerocopy`
+  --> tests/ui-nightly/../include.rs
    |
    |     pub struct NotZerocopy<T = ()>(pub T);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: Consider adding `#[derive(FromBytes)]` to `NotZerocopy`
-   = help: the following other types implement trait `zerocopy::FromBytes`:
+   = help: the following other types implement trait `FromBytes`:
              ()
-             AU16
-             AtomicI16
-             AtomicI32
-             AtomicI64
-             AtomicI8
-             AtomicIsize
-             AtomicU16
+             (A, B)
+             (A, B, C)
+             (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
            and $N others
 note: required by a bound in `DST_NOT_FROM_BYTES::transmute`
-  --> tests/ui-nightly/transmute-dst-not-frombytes.rs:19:41
+  --> tests/ui-nightly/transmute-dst-not-frombytes.rs:17:41
    |
-19 | const DST_NOT_FROM_BYTES: NotZerocopy = transmute!(AU16(0));
+17 | const DST_NOT_FROM_BYTES: NotZerocopy = transmute!(AU16(0));
    |                                         ^^^^^^^^^^^^^^^^^^^
    |                                         |
    |                                         required by a bound in this function

data/rust-vendor/zerocopy/tests/ui-nightly/transmute-mut-const.rs

@@ -6,9 +6,7 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-include!("../../zerocopy-derive/tests/include.rs");
-
-extern crate zerocopy;
+include!("../include.rs");
 
 use zerocopy::transmute_mut;
 

data/rust-vendor/zerocopy/tests/ui-nightly/transmute-mut-const.stderr

@@ -1,22 +1,22 @@
 warning: taking a mutable reference to a `const` item
-  --> tests/ui-nightly/transmute-mut-const.rs:20:52
+  --> tests/ui-nightly/transmute-mut-const.rs:18:52
    |
-20 | const CONST_CONTEXT: &mut [u8; 2] = transmute_mut!(&mut ARRAY_OF_U8S);
+18 | const CONST_CONTEXT: &mut [u8; 2] = transmute_mut!(&mut ARRAY_OF_U8S);
    |                                                    ^^^^^^^^^^^^^^^^^
    |
    = note: each usage of a `const` item creates a new temporary
    = note: the mutable reference will refer to this temporary, not the original `const` item
 note: `const` item defined here
-  --> tests/ui-nightly/transmute-mut-const.rs:17:1
+  --> tests/ui-nightly/transmute-mut-const.rs:15:1
    |
-17 | const ARRAY_OF_U8S: [u8; 2] = [0u8; 2];
+15 | const ARRAY_OF_U8S: [u8; 2] = [0u8; 2];
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: `#[warn(const_item_mutation)]` on by default
 
-error[E0015]: cannot call non-const method `Wrap::<&mut [u8; 2], &mut [u8; 2]>::transmute_mut` in constants
-  --> tests/ui-nightly/transmute-mut-const.rs:20:37
+error[E0015]: cannot call non-const method `zerocopy::util::macro_util::Wrap::<&mut [u8; 2], &mut [u8; 2]>::transmute_mut` in constants
+  --> tests/ui-nightly/transmute-mut-const.rs:18:37
    |
-20 | const CONST_CONTEXT: &mut [u8; 2] = transmute_mut!(&mut ARRAY_OF_U8S);
+18 | const CONST_CONTEXT: &mut [u8; 2] = transmute_mut!(&mut ARRAY_OF_U8S);
    |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants