diff --git a/.gitignore b/.gitignore index 686f1cc13b..85685a545c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ -# Copyright 2022 The Fuchsia Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright 2022 The Fuchsia Authors +# +# Licensed under the 2-Clause BSD License , Apache License, Version 2.0 +# , or the MIT +# license , at your option. +# This file may not be copied, modified, or distributed except according to +# those terms. target Cargo.lock diff --git a/tests/ui-msrv/include_value_not_from_bytes.stderr b/tests/ui-msrv/include_value_not_from_bytes.stderr index 75a6f56931..14dd22a71a 100644 --- a/tests/ui-msrv/include_value_not_from_bytes.stderr +++ b/tests/ui-msrv/include_value_not_from_bytes.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not satisfied - --> tests/ui-msrv/include_value_not_from_bytes.rs:15:42 + --> tests/ui-msrv/include_value_not_from_bytes.rs:19:42 | -15 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); +19 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy` | note: required by `AssertIsFromBytes` - --> tests/ui-msrv/include_value_not_from_bytes.rs:15:42 + --> tests/ui-msrv/include_value_not_from_bytes.rs:19:42 | -15 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); +19 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: this error originates in the macro `$crate::transmute` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/tests/ui-msrv/include_value_wrong_size.stderr b/tests/ui-msrv/include_value_wrong_size.stderr index 30045849d7..b4531c7fa5 100644 --- a/tests/ui-msrv/include_value_wrong_size.stderr +++ b/tests/ui-msrv/include_value_wrong_size.stderr @@ -1,7 +1,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-sized types - --> tests/ui-msrv/include_value_wrong_size.rs:11:25 + --> tests/ui-msrv/include_value_wrong_size.rs:15:25 | -11 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data"); +15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: source type: `[u8; 4]` (32 bits) diff --git a/tests/ui-nightly/include_value_not_from_bytes.rs b/tests/ui-nightly/include_value_not_from_bytes.rs index ddf94727f9..e628933612 100644 --- a/tests/ui-nightly/include_value_not_from_bytes.rs +++ b/tests/ui-nightly/include_value_not_from_bytes.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. include!("../../zerocopy-derive/tests/include.rs"); diff --git a/tests/ui-nightly/include_value_not_from_bytes.stderr b/tests/ui-nightly/include_value_not_from_bytes.stderr index 0538eb26f1..a990f1fa49 100644 --- a/tests/ui-nightly/include_value_not_from_bytes.stderr +++ b/tests/ui-nightly/include_value_not_from_bytes.stderr @@ -1,7 +1,7 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not satisfied - --> tests/ui-nightly/include_value_not_from_bytes.rs:15:42 + --> tests/ui-nightly/include_value_not_from_bytes.rs:19:42 | -15 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); +19 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | | | the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy` @@ -19,8 +19,8 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not sat AtomicU16 and $N others note: required by a bound in `AssertIsFromBytes` - --> tests/ui-nightly/include_value_not_from_bytes.rs:15:42 + --> tests/ui-nightly/include_value_not_from_bytes.rs:19:42 | -15 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); +19 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `AssertIsFromBytes` = 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) diff --git a/tests/ui-nightly/include_value_wrong_size.rs b/tests/ui-nightly/include_value_wrong_size.rs index d87b30698b..e02b2be838 100644 --- a/tests/ui-nightly/include_value_wrong_size.rs +++ b/tests/ui-nightly/include_value_wrong_size.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. #[macro_use] extern crate zerocopy; diff --git a/tests/ui-nightly/include_value_wrong_size.stderr b/tests/ui-nightly/include_value_wrong_size.stderr index f592ece1de..54fcc46fdc 100644 --- a/tests/ui-nightly/include_value_wrong_size.stderr +++ b/tests/ui-nightly/include_value_wrong_size.stderr @@ -1,7 +1,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-sized types - --> tests/ui-nightly/include_value_wrong_size.rs:11:25 + --> tests/ui-nightly/include_value_wrong_size.rs:15:25 | -11 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data"); +15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: source type: `[u8; 4]` (32 bits) diff --git a/tests/ui-stable/include_value_not_from_bytes.stderr b/tests/ui-stable/include_value_not_from_bytes.stderr index 17e737147f..3f569ac971 100644 --- a/tests/ui-stable/include_value_not_from_bytes.stderr +++ b/tests/ui-stable/include_value_not_from_bytes.stderr @@ -1,7 +1,7 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not satisfied - --> tests/ui-stable/include_value_not_from_bytes.rs:15:42 + --> tests/ui-stable/include_value_not_from_bytes.rs:19:42 | -15 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); +19 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | | | the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy` @@ -19,8 +19,8 @@ error[E0277]: the trait bound `NotZerocopy: zerocopy::FromBytes` is not sat AtomicU16 and $N others note: required by a bound in `AssertIsFromBytes` - --> tests/ui-stable/include_value_not_from_bytes.rs:15:42 + --> tests/ui-stable/include_value_not_from_bytes.rs:19:42 | -15 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); +19 | const NOT_FROM_BYTES: NotZerocopy = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `AssertIsFromBytes` = 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) diff --git a/tests/ui-stable/include_value_wrong_size.stderr b/tests/ui-stable/include_value_wrong_size.stderr index 956d74c505..14caab4b65 100644 --- a/tests/ui-stable/include_value_wrong_size.stderr +++ b/tests/ui-stable/include_value_wrong_size.stderr @@ -1,7 +1,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-sized types - --> tests/ui-stable/include_value_wrong_size.rs:11:25 + --> tests/ui-stable/include_value_wrong_size.rs:15:25 | -11 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data"); +15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: source type: `[u8; 4]` (32 bits) diff --git a/zerocopy-derive/tests/enum_known_layout.rs b/zerocopy-derive/tests/enum_known_layout.rs index e167f7d922..72e52fa67a 100644 --- a/zerocopy-derive/tests/enum_known_layout.rs +++ b/zerocopy-derive/tests/enum_known_layout.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. // See comment in `include.rs` for why we disable the prelude. #![no_implicit_prelude] diff --git a/zerocopy-derive/tests/enum_no_cell.rs b/zerocopy-derive/tests/enum_no_cell.rs index 8ba7fbd76d..f22b8da8ce 100644 --- a/zerocopy-derive/tests/enum_no_cell.rs +++ b/zerocopy-derive/tests/enum_no_cell.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. // See comment in `include.rs` for why we disable the prelude. #![no_implicit_prelude] diff --git a/zerocopy-derive/tests/struct_known_layout.rs b/zerocopy-derive/tests/struct_known_layout.rs index 8d2588d54c..1cfc584099 100644 --- a/zerocopy-derive/tests/struct_known_layout.rs +++ b/zerocopy-derive/tests/struct_known_layout.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. // See comment in `include.rs` for why we disable the prelude. #![no_implicit_prelude] diff --git a/zerocopy-derive/tests/struct_no_cell.rs b/zerocopy-derive/tests/struct_no_cell.rs index 3ff5befda0..776996df8f 100644 --- a/zerocopy-derive/tests/struct_no_cell.rs +++ b/zerocopy-derive/tests/struct_no_cell.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. // See comment in `include.rs` for why we disable the prelude. #![no_implicit_prelude] diff --git a/zerocopy-derive/tests/union_known_layout.rs b/zerocopy-derive/tests/union_known_layout.rs index c309869d18..c8668759d3 100644 --- a/zerocopy-derive/tests/union_known_layout.rs +++ b/zerocopy-derive/tests/union_known_layout.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. // See comment in `include.rs` for why we disable the prelude. #![no_implicit_prelude] diff --git a/zerocopy-derive/tests/union_no_cell.rs b/zerocopy-derive/tests/union_no_cell.rs index a0775af22d..46070fe914 100644 --- a/zerocopy-derive/tests/union_no_cell.rs +++ b/zerocopy-derive/tests/union_no_cell.rs @@ -1,6 +1,10 @@ -// Copyright 2022 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2023 The Fuchsia Authors +// +// Licensed under a BSD-style license , Apache License, Version 2.0 +// , or the MIT +// license , at your option. +// This file may not be copied, modified, or distributed except according to +// those terms. // See comment in `include.rs` for why we disable the prelude. #![no_implicit_prelude]