Use Rust conventional comment style for license headers

Signed-off-by: Andrew Gunnerson <[email protected]>
chenxiaolong · Sep 22, 2024 · c974ab5 · c974ab5
1 parent 02ae9cd
commit c974ab5
Show file tree

Hide file tree

Showing 56 changed files with 119 additions and 201 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;