diff options
| author | bors <bors@rust-lang.org> | 2023-03-11 01:17:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-11 01:17:23 +0000 |
| commit | 7333b36fa4690567e2ee362e6403976ffa85d8a7 (patch) | |
| tree | be550bb970722644907c18921eabdb92a94d9fc3 | |
| parent | 15d7278df84de0b2c7e72d2a06a3a95f23370982 (diff) | |
| parent | 3d229d535c416787a9541bb26cb5f928d4a38a0d (diff) | |
| download | rust-7333b36fa4690567e2ee362e6403976ffa85d8a7.tar.gz rust-7333b36fa4690567e2ee362e6403976ffa85d8a7.zip | |
Auto merge of #104527 - ferrocene:pa-more-licenses, r=pnkfelix
Add more license annotations This PR updates the `.reuse/dep5` file to include more accurate licensing data for everything in the repository (*excluding* submodules and dependencies). Some decisions were made in this PR: * The standard copyright attribution for files maintained by us is "The Rust Project Developers (see https://thanks.rust-lang.org)", to avoid having to maintain an in-tree `AUTHORS` file. * For files that have specific licensing terms, we added the terms to the `.reuse/dep5` rather than adding SPDX comments in the files themselves. * REUSE picks up any comment/text line with `Copyright` on it, so I had to sprinkle around `REUSE-IgnoreStart` and `REUSE-IgnoreEnd` comments. The rendered `COPYRIGHT` file is available at https://gist.github.com/pietroalbini/efb81103f69596d39758114f3f6a8688. r? `@pnkfelix`
| -rw-r--r-- | COPYRIGHT | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | rustc_tools_util/README.md | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT index a6be75b5e31..82703b18fd7 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,3 +1,5 @@ +// REUSE-IgnoreStart + Copyright 2014-2022 The Rust Project Developers Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or @@ -5,3 +7,5 @@ http://www.apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option. All files in the project carrying such notice may not be copied, modified, or distributed except according to those terms. + +// REUSE-IgnoreEnd diff --git a/README.md b/README.md index 3e7379ace7e..b69ed8900a4 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,8 @@ If you want to contribute to Clippy, you can find more information in [CONTRIBUT ## License +<!-- REUSE-IgnoreStart --> + Copyright 2014-2022 The Rust Project Developers Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or @@ -282,3 +284,5 @@ Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or <LICENSE-MIT or [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)>, at your option. Files in the project may not be copied, modified, or distributed except according to those terms. + +<!-- REUSE-IgnoreEnd --> diff --git a/rustc_tools_util/README.md b/rustc_tools_util/README.md index eefc661f963..e197ea048a0 100644 --- a/rustc_tools_util/README.md +++ b/rustc_tools_util/README.md @@ -49,6 +49,8 @@ The changelog for `rustc_tools_util` is available under: ## License +<!-- REUSE-IgnoreStart --> + Copyright 2014-2022 The Rust Project Developers Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or @@ -56,3 +58,5 @@ http://www.apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option. All files in the project carrying such notice may not be copied, modified, or distributed except according to those terms. + +<!-- REUSE-IgnoreEnd --> |