rust: simplify copyright notes in source files

rizsotto · rizsotto · commit 81570372c4a9 · 2024-10-20T17:11:49.000+11:00
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 [workspace]
 members = [
   "bear",
diff --git a/rust/bear/Cargo.toml b/rust/bear/Cargo.toml
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 [package]
 name = "bear"
 description = "Bear is a tool that generates a compilation database for clang tooling."
diff --git a/rust/bear/build.rs b/rust/bear/build.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 fn main() {
     println!("cargo:rustc-env=WRAPPER_EXECUTABLE_PATH=/usr/libexec/bear/wrapper");
     println!("cargo:rustc-env=PRELOAD_LIBRARY_PATH=/usr/libexec/bear/$LIB/libexec.so");
diff --git a/rust/bear/src/args.rs b/rust/bear/src/args.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 //! This module contains the command line interface of the application.
 //!
diff --git a/rust/bear/src/bin/main.rs b/rust/bear/src/bin/main.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 use std::process::ExitCode;
 
 use bear::input::EventFileReader;
diff --git a/rust/bear/src/config.rs b/rust/bear/src/config.rs
@@ -1,21 +1,5 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 use std::collections::HashSet;
 use std::fs::OpenOptions;
 use std::path::{Path, PathBuf};
diff --git a/rust/bear/src/fixtures.rs b/rust/bear/src/fixtures.rs
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #[cfg(test)]
 pub mod fixtures {
diff --git a/rust/bear/src/input.rs b/rust/bear/src/input.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 use anyhow::Context;
 use serde_json::{Deserializer, Error, Value};
diff --git a/rust/bear/src/lib.rs b/rust/bear/src/lib.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 pub mod args;
 pub mod config;
 mod fixtures;
diff --git a/rust/bear/src/output/clang/iterator.rs b/rust/bear/src/output/clang/iterator.rs
@@ -1,4 +1,7 @@
-// from https://github.com/serde-rs/json/issues/404#issuecomment-892957228
+// SPDX-License-Identifier: GPL-3.0-or-later
+//! Provides an iterator over a JSON array of objects.
+//!
+//! from https://github.com/serde-rs/json/issues/404#issuecomment-892957228
 
 use std::io::{self, Read};
 
diff --git a/rust/bear/src/output/clang/mod.rs b/rust/bear/src/output/clang/mod.rs
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
 //! This crate provides support for reading and writing JSON compilation database files.
 //!
 //! A compilation database is a set of records which describe the compilation of the
diff --git a/rust/bear/src/output/clang/type_de.rs b/rust/bear/src/output/clang/type_de.rs
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+//! Implements deserialization of the `Entry` struct.
+
 use std::fmt;
 use std::path;
 
diff --git a/rust/bear/src/output/clang/type_ser.rs b/rust/bear/src/output/clang/type_ser.rs
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+//! Implements serialization of the `Entry` struct.
+
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 
 use super::Entry;
diff --git a/rust/bear/src/output/filter.rs b/rust/bear/src/output/filter.rs
@@ -1,22 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
+// SPDX-License-Identifier: GPL-3.0-or-later
 use std::hash::Hash;
 use std::path::PathBuf;
 
diff --git a/rust/bear/src/output/mod.rs b/rust/bear/src/output/mod.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 use std::fs::{File, OpenOptions};
 use std::io::{BufReader, BufWriter};
 use std::path::{Path, PathBuf};
diff --git a/rust/bear/src/semantic/mod.rs b/rust/bear/src/semantic/mod.rs
@@ -1,21 +1,5 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 pub mod tools;
 
 use intercept::Execution;
diff --git a/rust/bear/src/semantic/tools/combinators.rs b/rust/bear/src/semantic/tools/combinators.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 use super::super::{RecognitionResult, Tool};
 use intercept::Execution;
diff --git a/rust/bear/src/semantic/tools/gcc.rs b/rust/bear/src/semantic/tools/gcc.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 use nom::branch::alt;
 use nom::multi::many1;
diff --git a/rust/bear/src/semantic/tools/generic.rs b/rust/bear/src/semantic/tools/generic.rs
@@ -1,21 +1,5 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 use std::collections::HashSet;
 use std::path::PathBuf;
 use std::vec;
diff --git a/rust/bear/src/semantic/tools/ignore.rs b/rust/bear/src/semantic/tools/ignore.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 use std::collections::HashSet;
 use std::path::PathBuf;
diff --git a/rust/bear/src/semantic/tools/matchers/mod.rs b/rust/bear/src/semantic/tools/matchers/mod.rs
@@ -1,20 +1,3 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 pub(super) mod source;
diff --git a/rust/bear/src/semantic/tools/matchers/source.rs b/rust/bear/src/semantic/tools/matchers/source.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 use lazy_static::lazy_static;
 use std::collections::HashSet;
diff --git a/rust/bear/src/semantic/tools/mod.rs b/rust/bear/src/semantic/tools/mod.rs
@@ -1,21 +1,4 @@
-/*  Copyright (C) 2012-2024 by László Nagy
-    This file is part of Bear.
-
-    Bear is a tool to generate compilation database for clang tooling.
-
-    Bear is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Bear is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 use std::path::PathBuf;
 
diff --git a/rust/bear/tests/test.rs b/rust/bear/tests/test.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 use std::io::{Cursor, Seek, SeekFrom};
 
 use serde_json::error::Category;
diff --git a/rust/intercept/Cargo.toml b/rust/intercept/Cargo.toml
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 [package]
 name = "intercept"
 description = "Rust crate to intercept executed of commands."
diff --git a/rust/intercept/src/bin/wrapper.rs b/rust/intercept/src/bin/wrapper.rs
diff --git a/rust/intercept/src/collector.rs b/rust/intercept/src/collector.rs
diff --git a/rust/intercept/src/lib.rs b/rust/intercept/src/lib.rs
diff --git a/rust/intercept/src/reporter.rs b/rust/intercept/src/reporter.rs
diff --git a/rust/intercept/tests/test.rs b/rust/intercept/tests/test.rs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# SPDX-License-Identifier: GPL-3.0-or-later`
	`2`	`+`
`1`	`3`	`[workspace]`
`2`	`4`	`members = [`
`3`	`5`	`"bear",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# SPDX-License-Identifier: GPL-3.0-or-later`
	`2`	`+`
`1`	`3`	`[package]`
`2`	`4`	`name = "bear"`
`3`	`5`	`description = "Bear is a tool that generates a compilation database for clang tooling."`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: GPL-3.0-or-later`
	`2`	`+`
`1`	`3`	`fn main() {`
`2`	`4`	`println!("cargo:rustc-env=WRAPPER_EXECUTABLE_PATH=/usr/libexec/bear/wrapper");`
`3`	`5`	`println!("cargo:rustc-env=PRELOAD_LIBRARY_PATH=/usr/libexec/bear/$LIB/libexec.so");`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// SPDX-License-Identifier: GPL-3.0-or-later`
`1`	`2`
`2`	`3`	`#[cfg(test)]`
`3`	`4`	`pub mod fixtures {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: GPL-3.0-or-later`
	`2`	`+`
`1`	`3`	`pub mod args;`
`2`	`4`	`pub mod config;`
`3`	`5`	`mod fixtures;`