From c974ab5ec3f760bb8feb46b4957e3887e363c703 Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Sun, 22 Sep 2024 14:58:01 -0400 Subject: [PATCH] Use Rust conventional comment style for license headers Signed-off-by: Andrew Gunnerson --- avbroot/build.rs | 6 ++---- avbroot/src/cli/args.rs | 6 ++---- avbroot/src/cli/avb.rs | 6 ++---- avbroot/src/cli/boot.rs | 6 ++---- avbroot/src/cli/completion.rs | 6 ++---- avbroot/src/cli/cpio.rs | 6 ++---- avbroot/src/cli/fec.rs | 6 ++---- avbroot/src/cli/hashtree.rs | 6 ++---- avbroot/src/cli/key.rs | 6 ++---- avbroot/src/cli/lp.rs | 6 ++---- avbroot/src/cli/mod.rs | 6 ++---- avbroot/src/cli/ota.rs | 6 ++---- avbroot/src/cli/payload.rs | 6 ++---- avbroot/src/cli/sparse.rs | 6 ++---- avbroot/src/crypto.rs | 6 ++---- avbroot/src/escape.rs | 6 ++---- avbroot/src/format/avb.rs | 6 ++---- avbroot/src/format/bootimage.rs | 6 ++---- avbroot/src/format/compression.rs | 6 ++---- avbroot/src/format/cpio.rs | 6 ++---- avbroot/src/format/fec.rs | 6 ++---- avbroot/src/format/hashtree.rs | 6 ++---- avbroot/src/format/lp.rs | 6 ++---- avbroot/src/format/mod.rs | 6 ++---- avbroot/src/format/ota.rs | 6 ++---- avbroot/src/format/padding.rs | 6 ++---- avbroot/src/format/payload.rs | 6 ++---- avbroot/src/format/sparse.rs | 6 ++---- avbroot/src/format/verityrs.rs | 6 ++---- avbroot/src/lib.rs | 6 ++---- avbroot/src/main.rs | 6 ++---- avbroot/src/octal.rs | 6 ++---- avbroot/src/patch/boot.rs | 6 ++---- avbroot/src/patch/mod.rs | 6 ++---- avbroot/src/patch/otacert.rs | 6 ++---- avbroot/src/patch/system.rs | 6 ++---- avbroot/src/stream.rs | 6 ++---- avbroot/src/util.rs | 6 ++---- avbroot/tests/avb.rs | 6 ++---- avbroot/tests/bootimage.rs | 6 ++---- avbroot/tests/compression.rs | 6 ++---- avbroot/tests/cpio.rs | 6 ++---- avbroot/tests/lp.rs | 6 ++---- avbroot/tests/sparse.rs | 6 ++---- e2e/src/cli.rs | 6 ++---- e2e/src/config.rs | 6 ++---- e2e/src/main.rs | 8 +++----- fuzz/src/bin/avb.rs | 3 +++ fuzz/src/bin/bootimage.rs | 3 +++ fuzz/src/bin/cpio.rs | 3 +++ fuzz/src/bin/fec.rs | 3 +++ fuzz/src/bin/lp.rs | 3 +++ fuzz/src/bin/sparse.rs | 3 +++ xtask/src/changelog.rs | 6 ++---- xtask/src/main.rs | 6 ++---- xtask/src/version.rs | 6 ++---- 56 files changed, 119 insertions(+), 201 deletions(-) diff --git a/avbroot/build.rs b/avbroot/build.rs index d25b258..e258412 100644 --- a/avbroot/build.rs +++ b/avbroot/build.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{env, ffi::OsStr, fs, io, path::Path}; diff --git a/avbroot/src/cli/args.rs b/avbroot/src/cli/args.rs index 0532fca..8ea2cf1 100644 --- a/avbroot/src/cli/args.rs +++ b/avbroot/src/cli/args.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fmt, diff --git a/avbroot/src/cli/avb.rs b/avbroot/src/cli/avb.rs index 3d34008..9ffcc83 100644 --- a/avbroot/src/cli/avb.rs +++ b/avbroot/src/cli/avb.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ collections::{HashMap, HashSet}, diff --git a/avbroot/src/cli/boot.rs b/avbroot/src/cli/boot.rs index 2f7208b..c42c5e7 100644 --- a/avbroot/src/cli/boot.rs +++ b/avbroot/src/cli/boot.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fs::{self, File}, diff --git a/avbroot/src/cli/completion.rs b/avbroot/src/cli/completion.rs index 97e860e..55856ba 100644 --- a/avbroot/src/cli/completion.rs +++ b/avbroot/src/cli/completion.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::io; diff --git a/avbroot/src/cli/cpio.rs b/avbroot/src/cli/cpio.rs index a01d52f..7d688f2 100644 --- a/avbroot/src/cli/cpio.rs +++ b/avbroot/src/cli/cpio.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fs::{self, File}, diff --git a/avbroot/src/cli/fec.rs b/avbroot/src/cli/fec.rs index 846fd1f..6d23d38 100644 --- a/avbroot/src/cli/fec.rs +++ b/avbroot/src/cli/fec.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fs::{File, OpenOptions}, diff --git a/avbroot/src/cli/hashtree.rs b/avbroot/src/cli/hashtree.rs index e4b782a..7378b7c 100644 --- a/avbroot/src/cli/hashtree.rs +++ b/avbroot/src/cli/hashtree.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fs::{File, OpenOptions}, diff --git a/avbroot/src/cli/key.rs b/avbroot/src/cli/key.rs index 40ad431..79df5fb 100644 --- a/avbroot/src/cli/key.rs +++ b/avbroot/src/cli/key.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ ffi::OsString, diff --git a/avbroot/src/cli/lp.rs b/avbroot/src/cli/lp.rs index 54baf46..9c871f7 100644 --- a/avbroot/src/cli/lp.rs +++ b/avbroot/src/cli/lp.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ ffi::OsStr, diff --git a/avbroot/src/cli/mod.rs b/avbroot/src/cli/mod.rs index 20e7576..cee30b3 100644 --- a/avbroot/src/cli/mod.rs +++ b/avbroot/src/cli/mod.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only pub mod args; pub mod avb; diff --git a/avbroot/src/cli/ota.rs b/avbroot/src/cli/ota.rs index 7d10b23..54c777c 100644 --- a/avbroot/src/cli/ota.rs +++ b/avbroot/src/cli/ota.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ borrow::Cow, diff --git a/avbroot/src/cli/payload.rs b/avbroot/src/cli/payload.rs index eb44804..b67f268 100644 --- a/avbroot/src/cli/payload.rs +++ b/avbroot/src/cli/payload.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ collections::HashMap, diff --git a/avbroot/src/cli/sparse.rs b/avbroot/src/cli/sparse.rs index 643954f..d0056af 100644 --- a/avbroot/src/cli/sparse.rs +++ b/avbroot/src/cli/sparse.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fmt, diff --git a/avbroot/src/crypto.rs b/avbroot/src/crypto.rs index 703b7fe..006bb59 100644 --- a/avbroot/src/crypto.rs +++ b/avbroot/src/crypto.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ env::{self, VarError}, diff --git a/avbroot/src/escape.rs b/avbroot/src/escape.rs index 2819f45..6bf0b06 100644 --- a/avbroot/src/escape.rs +++ b/avbroot/src/escape.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{fmt, marker::PhantomData}; diff --git a/avbroot/src/format/avb.rs b/avbroot/src/format/avb.rs index 1082742..f0d24fa 100644 --- a/avbroot/src/format/avb.rs +++ b/avbroot/src/format/avb.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fmt, diff --git a/avbroot/src/format/bootimage.rs b/avbroot/src/format/bootimage.rs index 39afcca..c398700 100644 --- a/avbroot/src/format/bootimage.rs +++ b/avbroot/src/format/bootimage.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fmt, diff --git a/avbroot/src/format/compression.rs b/avbroot/src/format/compression.rs index c2c4da6..53a6254 100644 --- a/avbroot/src/format/compression.rs +++ b/avbroot/src/format/compression.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::io::{self, Read, Seek, Write}; diff --git a/avbroot/src/format/cpio.rs b/avbroot/src/format/cpio.rs index 4d3b82e..6bad338 100644 --- a/avbroot/src/format/cpio.rs +++ b/avbroot/src/format/cpio.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ collections::{HashMap, HashSet}, diff --git a/avbroot/src/format/fec.rs b/avbroot/src/format/fec.rs index 0acc62c..5a0a164 100644 --- a/avbroot/src/format/fec.rs +++ b/avbroot/src/format/fec.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ collections::HashSet, diff --git a/avbroot/src/format/hashtree.rs b/avbroot/src/format/hashtree.rs index 7d72887..56508df 100644 --- a/avbroot/src/format/hashtree.rs +++ b/avbroot/src/format/hashtree.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fmt, diff --git a/avbroot/src/format/lp.rs b/avbroot/src/format/lp.rs index 8cec2c6..5545d11 100644 --- a/avbroot/src/format/lp.rs +++ b/avbroot/src/format/lp.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ cmp::Ordering, diff --git a/avbroot/src/format/mod.rs b/avbroot/src/format/mod.rs index 4ceea9a..d129e20 100644 --- a/avbroot/src/format/mod.rs +++ b/avbroot/src/format/mod.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only pub mod avb; pub mod bootimage; diff --git a/avbroot/src/format/ota.rs b/avbroot/src/format/ota.rs index eafac6b..194eee8 100644 --- a/avbroot/src/format/ota.rs +++ b/avbroot/src/format/ota.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ collections::BTreeMap, diff --git a/avbroot/src/format/padding.rs b/avbroot/src/format/padding.rs index ffd6fd5..067846a 100644 --- a/avbroot/src/format/padding.rs +++ b/avbroot/src/format/padding.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::io::{self, Read, Seek, Write}; diff --git a/avbroot/src/format/payload.rs b/avbroot/src/format/payload.rs index 29e0683..9fb66bc 100644 --- a/avbroot/src/format/payload.rs +++ b/avbroot/src/format/payload.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ collections::{HashMap, HashSet}, diff --git a/avbroot/src/format/sparse.rs b/avbroot/src/format/sparse.rs index 756cfcb..a6eb506 100644 --- a/avbroot/src/format/sparse.rs +++ b/avbroot/src/format/sparse.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fmt, diff --git a/avbroot/src/format/verityrs.rs b/avbroot/src/format/verityrs.rs index 5119261..b44128f 100644 --- a/avbroot/src/format/verityrs.rs +++ b/avbroot/src/format/verityrs.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only // The gf256 library uses compile-time proc macro code generation. Since // dm-verity supports RS(255, 231) through RS(255, 253), we'll generate RS diff --git a/avbroot/src/lib.rs b/avbroot/src/lib.rs index bba0cc6..8c8d58d 100644 --- a/avbroot/src/lib.rs +++ b/avbroot/src/lib.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only //! Since avbroot is primarily an application and not a library, the semver //! versioning covers the CLI only. All Rust APIs can change at any time, even diff --git a/avbroot/src/main.rs b/avbroot/src/main.rs index b99a7c1..03891bb 100644 --- a/avbroot/src/main.rs +++ b/avbroot/src/main.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ process::ExitCode, diff --git a/avbroot/src/octal.rs b/avbroot/src/octal.rs index c39b27e..444a6bc 100644 --- a/avbroot/src/octal.rs +++ b/avbroot/src/octal.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only //! Hack to format an integer as an octal string because toml_edit can't output //! octal-formatted integers and many other toml parsers can't parse it either. diff --git a/avbroot/src/patch/boot.rs b/avbroot/src/patch/boot.rs index e862836..d0a9816 100644 --- a/avbroot/src/patch/boot.rs +++ b/avbroot/src/patch/boot.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ cmp::Ordering, diff --git a/avbroot/src/patch/mod.rs b/avbroot/src/patch/mod.rs index a9285f6..418756a 100644 --- a/avbroot/src/patch/mod.rs +++ b/avbroot/src/patch/mod.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only pub mod boot; pub mod otacert; diff --git a/avbroot/src/patch/otacert.rs b/avbroot/src/patch/otacert.rs index 3edc5e8..f0787c9 100644 --- a/avbroot/src/patch/otacert.rs +++ b/avbroot/src/patch/otacert.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{borrow::Cow, cmp::Ordering, io::Cursor}; diff --git a/avbroot/src/patch/system.rs b/avbroot/src/patch/system.rs index a8bd49c..285cde9 100644 --- a/avbroot/src/patch/system.rs +++ b/avbroot/src/patch/system.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ io::{self, Cursor, SeekFrom}, diff --git a/avbroot/src/stream.rs b/avbroot/src/stream.rs index 9b7af2a..6a33f37 100644 --- a/avbroot/src/stream.rs +++ b/avbroot/src/stream.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fs::File, diff --git a/avbroot/src/util.rs b/avbroot/src/util.rs index 398f605..534c63f 100644 --- a/avbroot/src/util.rs +++ b/avbroot/src/util.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{cmp::Ordering, fmt, ops::Range, path::Path}; diff --git a/avbroot/tests/avb.rs b/avbroot/tests/avb.rs index 35a8dde..911c890 100644 --- a/avbroot/tests/avb.rs +++ b/avbroot/tests/avb.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ io::{Cursor, Read, Seek, Write}, diff --git a/avbroot/tests/bootimage.rs b/avbroot/tests/bootimage.rs index cea6be5..5163644 100644 --- a/avbroot/tests/bootimage.rs +++ b/avbroot/tests/bootimage.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::io::Cursor; diff --git a/avbroot/tests/compression.rs b/avbroot/tests/compression.rs index ad0ded4..f88c496 100644 --- a/avbroot/tests/compression.rs +++ b/avbroot/tests/compression.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::io::{Cursor, Read, Seek, Write}; diff --git a/avbroot/tests/cpio.rs b/avbroot/tests/cpio.rs index e9953bd..7a8b0e2 100644 --- a/avbroot/tests/cpio.rs +++ b/avbroot/tests/cpio.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::io::{self, Cursor}; diff --git a/avbroot/tests/lp.rs b/avbroot/tests/lp.rs index b9696b1..a4242c1 100644 --- a/avbroot/tests/lp.rs +++ b/avbroot/tests/lp.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{io::Cursor, num::NonZeroU64}; diff --git a/avbroot/tests/sparse.rs b/avbroot/tests/sparse.rs index b2d3b85..2adbe3e 100644 --- a/avbroot/tests/sparse.rs +++ b/avbroot/tests/sparse.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::io::{Cursor, Read, Write}; diff --git a/e2e/src/cli.rs b/e2e/src/cli.rs index 63d9946..d04d802 100644 --- a/e2e/src/cli.rs +++ b/e2e/src/cli.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ffi::OsString, path::PathBuf}; diff --git a/e2e/src/config.rs b/e2e/src/config.rs index a3e5605..ce73699 100644 --- a/e2e/src/config.rs +++ b/e2e/src/config.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{collections::BTreeMap, fs, path::Path}; diff --git a/e2e/src/main.rs b/e2e/src/main.rs index e21840f..ae18e84 100644 --- a/e2e/src/main.rs +++ b/e2e/src/main.rs @@ -1,8 +1,6 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-FileCopyrightText: 2023 Pascal Roeleven - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-FileCopyrightText: 2023 Pascal Roeleven +// SPDX-License-Identifier: GPL-3.0-only mod cli; mod config; diff --git a/fuzz/src/bin/avb.rs b/fuzz/src/bin/avb.rs index 36a38d5..02d7bc2 100644 --- a/fuzz/src/bin/avb.rs +++ b/fuzz/src/bin/avb.rs @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only + #[cfg(not(windows))] mod fuzz { use std::io::Cursor; diff --git a/fuzz/src/bin/bootimage.rs b/fuzz/src/bin/bootimage.rs index 56d5eaa..7f12699 100644 --- a/fuzz/src/bin/bootimage.rs +++ b/fuzz/src/bin/bootimage.rs @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only + #[cfg(not(windows))] mod fuzz { use std::io::Cursor; diff --git a/fuzz/src/bin/cpio.rs b/fuzz/src/bin/cpio.rs index 8ae8e76..c720331 100644 --- a/fuzz/src/bin/cpio.rs +++ b/fuzz/src/bin/cpio.rs @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only + #[cfg(not(windows))] mod fuzz { use std::{io::Cursor, sync::atomic::AtomicBool}; diff --git a/fuzz/src/bin/fec.rs b/fuzz/src/bin/fec.rs index b9fe12e..ec82b79 100644 --- a/fuzz/src/bin/fec.rs +++ b/fuzz/src/bin/fec.rs @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only + #[cfg(not(windows))] mod fuzz { use std::{io::Cursor, sync::atomic::AtomicBool}; diff --git a/fuzz/src/bin/lp.rs b/fuzz/src/bin/lp.rs index e237bac..aa7b3a6 100644 --- a/fuzz/src/bin/lp.rs +++ b/fuzz/src/bin/lp.rs @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only + #[cfg(not(windows))] mod fuzz { use std::io::Cursor; diff --git a/fuzz/src/bin/sparse.rs b/fuzz/src/bin/sparse.rs index 0d77fd4..b6d07e0 100644 --- a/fuzz/src/bin/sparse.rs +++ b/fuzz/src/bin/sparse.rs @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only + #[cfg(not(windows))] mod fuzz { use std::io::{self, Cursor}; diff --git a/xtask/src/changelog.rs b/xtask/src/changelog.rs index 4e1b544..b7701c1 100644 --- a/xtask/src/changelog.rs +++ b/xtask/src/changelog.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ collections::BTreeMap, diff --git a/xtask/src/main.rs b/xtask/src/main.rs index f0a0509..12845a1 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only mod changelog; mod version; diff --git a/xtask/src/version.rs b/xtask/src/version.rs index e6d70bd..0dc52d4 100644 --- a/xtask/src/version.rs +++ b/xtask/src/version.rs @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson +// SPDX-License-Identifier: GPL-3.0-only use std::{ fs::{self, File},