about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-03-11 01:17:23 +0000
committerbors <bors@rust-lang.org>2023-03-11 01:17:23 +0000
commitbe445e1ab2f7188c337b3cc748d77a8f76aaeb45 (patch)
tree65c09510489d74d765ac70ae892ab9103f1a943d
parent82e675061c28fe99db0c94058164a3485357250a (diff)
parent0738ffe4198b190a81a13e1f1da41651ec6cbfb0 (diff)
downloadrust-be445e1ab2f7188c337b3cc748d77a8f76aaeb45.tar.gz
rust-be445e1ab2f7188c337b3cc748d77a8f76aaeb45.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--example/alloc_system.rs12
1 files changed, 3 insertions, 9 deletions
diff --git a/example/alloc_system.rs b/example/alloc_system.rs
index 50261c19397..e64daf96b01 100644
--- a/example/alloc_system.rs
+++ b/example/alloc_system.rs
@@ -1,12 +1,6 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
+
 #![no_std]
 
 pub struct System;