Skip to content

Commit 7a68564

Browse files
joshlfjoshlf
authored
Fix copyright headers (#1751)
1 parent 4c8b529 commit 7a68564

15 files changed

+82
-45
lines changed

‎.gitignore

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
# Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
# Use of this source code is governed by a BSD-style license that can be
3-
# found in the LICENSE file.
1+
# Copyright 2022 The Fuchsia Authors
2+
#
3+
# Licensed under the 2-Clause BSD License <LICENSE-BSD or
4+
# https://opensource.org/license/bsd-2-clause>, Apache License, Version 2.0
5+
# <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
6+
# license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
7+
# This file may not be copied, modified, or distributed except according to
8+
# those terms.
49

510
target
611
Cargo.lock

‎tests/ui-msrv/include_value_not_from_bytes.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
error[E0277]: the trait bound `NotZerocopy<u32>: zerocopy::FromBytes` is not satisfied
2-
--> tests/ui-msrv/include_value_not_from_bytes.rs:15:42
2+
--> tests/ui-msrv/include_value_not_from_bytes.rs:19:42
33
|
4-
15 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
4+
19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy<u32>`
66
|
77
note: required by `AssertIsFromBytes`
8-
--> tests/ui-msrv/include_value_not_from_bytes.rs:15:42
8+
--> tests/ui-msrv/include_value_not_from_bytes.rs:19:42
99
|
10-
15 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
10+
19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= note: this error originates in the macro `$crate::transmute` (in Nightly builds, run with -Z macro-backtrace for more info)

‎tests/ui-msrv/include_value_wrong_size.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
2-
--> tests/ui-msrv/include_value_wrong_size.rs:11:25
2+
--> tests/ui-msrv/include_value_wrong_size.rs:15:25
33
|
4-
11 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
4+
15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: source type: `[u8; 4]` (32 bits)

‎tests/ui-nightly/include_value_not_from_bytes.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
include!("../../zerocopy-derive/tests/include.rs");
610

‎tests/ui-nightly/include_value_not_from_bytes.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0277]: the trait bound `NotZerocopy<u32>: zerocopy::FromBytes` is not satisfied
2-
--> tests/ui-nightly/include_value_not_from_bytes.rs:15:42
2+
--> tests/ui-nightly/include_value_not_from_bytes.rs:19:42
33
|
4-
15 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
4+
19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
| |
77
| the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy<u32>`
@@ -19,8 +19,8 @@ error[E0277]: the trait bound `NotZerocopy<u32>: zerocopy::FromBytes` is not sat
1919
AtomicU16
2020
and $N others
2121
note: required by a bound in `AssertIsFromBytes`
22-
--> tests/ui-nightly/include_value_not_from_bytes.rs:15:42
22+
--> tests/ui-nightly/include_value_not_from_bytes.rs:19:42
2323
|
24-
15 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
24+
19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `AssertIsFromBytes`
2626
= 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)

‎tests/ui-nightly/include_value_wrong_size.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
#[macro_use]
610
extern crate zerocopy;

‎tests/ui-nightly/include_value_wrong_size.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
2-
--> tests/ui-nightly/include_value_wrong_size.rs:11:25
2+
--> tests/ui-nightly/include_value_wrong_size.rs:15:25
33
|
4-
11 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
4+
15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: source type: `[u8; 4]` (32 bits)

‎tests/ui-stable/include_value_not_from_bytes.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0277]: the trait bound `NotZerocopy<u32>: zerocopy::FromBytes` is not satisfied
2-
--> tests/ui-stable/include_value_not_from_bytes.rs:15:42
2+
--> tests/ui-stable/include_value_not_from_bytes.rs:19:42
33
|
4-
15 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
4+
19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
| |
77
| the trait `zerocopy::FromBytes` is not implemented for `NotZerocopy<u32>`
@@ -19,8 +19,8 @@ error[E0277]: the trait bound `NotZerocopy<u32>: zerocopy::FromBytes` is not sat
1919
AtomicU16
2020
and $N others
2121
note: required by a bound in `AssertIsFromBytes`
22-
--> tests/ui-stable/include_value_not_from_bytes.rs:15:42
22+
--> tests/ui-stable/include_value_not_from_bytes.rs:19:42
2323
|
24-
15 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
24+
19 | const NOT_FROM_BYTES: NotZerocopy<u32> = include_value!("../../testdata/include_value/data");
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `AssertIsFromBytes`
2626
= 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)

‎tests/ui-stable/include_value_wrong_size.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
2-
--> tests/ui-stable/include_value_wrong_size.rs:11:25
2+
--> tests/ui-stable/include_value_wrong_size.rs:15:25
33
|
4-
11 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
4+
15 | const WRONG_SIZE: u64 = include_value!("../../testdata/include_value/data");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: source type: `[u8; 4]` (32 bits)

‎zerocopy-derive/tests/enum_known_layout.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
// See comment in `include.rs` for why we disable the prelude.
610
#![no_implicit_prelude]

‎zerocopy-derive/tests/enum_no_cell.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
// See comment in `include.rs` for why we disable the prelude.
610
#![no_implicit_prelude]

‎zerocopy-derive/tests/struct_known_layout.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
// See comment in `include.rs` for why we disable the prelude.
610
#![no_implicit_prelude]

‎zerocopy-derive/tests/struct_no_cell.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
// See comment in `include.rs` for why we disable the prelude.
610
#![no_implicit_prelude]

‎zerocopy-derive/tests/union_known_layout.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
// See comment in `include.rs` for why we disable the prelude.
610
#![no_implicit_prelude]

‎zerocopy-derive/tests/union_no_cell.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Copyright 2022 The Fuchsia Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
1+
// Copyright 2023 The Fuchsia Authors
2+
//
3+
// Licensed under a BSD-style license <LICENSE-BSD>, Apache License, Version 2.0
4+
// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0>, or the MIT
5+
// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option.
6+
// This file may not be copied, modified, or distributed except according to
7+
// those terms.
48

59
// See comment in `include.rs` for why we disable the prelude.
610
#![no_implicit_prelude]

0 commit comments

Comments
 (0)