diff --git a/REUSE.toml b/REUSE.toml index d755da80830..5c7ea8e6f14 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -34,13 +34,13 @@ path = [ ".mailmap", ".ignore", ] -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)" SPDX-License-Identifier = "MIT or Apache-2.0" [[annotations]] path = "compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "2003-2019 University of Illinois at Urbana-Champaign.", "The Rust Project Developers (see https://thanks.rust-lang.org)", @@ -49,13 +49,13 @@ SPDX-License-Identifier = "Apache-2.0 WITH LLVM-exception AND (Apache-2.0 OR MIT [[annotations]] path = "library/core/src/unicode/unicode_data.rs" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = "1991-2022 Unicode, Inc. All rights reserved." SPDX-License-Identifier = "Unicode-DFS-2016" [[annotations]] path = "library/std/src/sync/mpmc/**" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "2019 The Crossbeam Project Developers", "The Rust Project Developers (see https://thanks.rust-lang.org)", @@ -64,7 +64,7 @@ SPDX-License-Identifier = "MIT OR Apache-2.0" [[annotations]] path = "library/std/src/sys/sync/mutex/fuchsia.rs" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "2016 The Fuchsia Authors", "The Rust Project Developers (see https://thanks.rust-lang.org)", @@ -73,19 +73,19 @@ SPDX-License-Identifier = "BSD-2-Clause AND (MIT OR Apache-2.0)" [[annotations]] path = "src/test/rustdoc/auxiliary/enum-primitive.rs" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = "2015 Anders Kaseorg " SPDX-License-Identifier = "MIT" [[annotations]] path = "src/librustdoc/html/static/fonts/FiraSans**" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = ["2014, Mozilla Foundation", "2014, Telefonica S.A."] SPDX-License-Identifier = "OFL-1.1" [[annotations]] path = "src/librustdoc/html/static/fonts/NanumBarun**" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = "2010 NAVER Corporation" SPDX-License-Identifier = "OFL-1.1" @@ -94,19 +94,19 @@ path = [ "src/librustdoc/html/static/fonts/SourceCodePro**", "src/librustdoc/html/static/fonts/SourceSerif4**", ] -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = "2010, 2012, 2014-2023, Adobe Systems Incorporated" SPDX-License-Identifier = "OFL-1.1" [[annotations]] path = "src/librustdoc/html/static/css/normalize.css" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = "Nicolas Gallagher and Jonathan Neal" SPDX-License-Identifier = "MIT" [[annotations]] path = "src/librustdoc/html/static/css/rustdoc.css" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "2016 Ike Ku, Jessica Stokes and Leon Guan", "The Rust Project Developers (see https://thanks.rust-lang.org)", @@ -115,13 +115,13 @@ SPDX-License-Identifier = "MIT OR Apache-2.0" [[annotations]] path = "src/doc/rustc-dev-guide/mermaid.min.js" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = "2014-2021 Knut Sveidqvist" SPDX-License-Identifier = "MIT" [[annotations]] path = "library/backtrace/**" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "2014 Alex Crichton", "The Rust Project Developers (see https://thanks.rust-lang.org)", @@ -130,7 +130,7 @@ SPDX-License-Identifier = "MIT OR Apache-2.0" [[annotations]] path = "src/doc/embedded-book/**" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "Rust on Embedded Devices Working Group", "The Rust Project Developers (see https://thanks.rust-lang.org)", @@ -139,7 +139,7 @@ SPDX-License-Identifier = "MIT OR Apache-2.0 OR CC-BY-SA-4.0" [[annotations]] path = "src/doc/rust-by-example/**" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "2014 Jorge Aparicio", "The Rust Project Developers (see https://thanks.rust-lang.org)", @@ -148,7 +148,7 @@ SPDX-License-Identifier = "MIT OR Apache-2.0" [[annotations]] path = "src/llvm-project/**" -precedence = "aggregate" +precedence = "override" SPDX-FileCopyrightText = [ "2003-2019 by the contributors listed in [CREDITS.TXT](https://github.com/rust-lang/llvm-project/blob/7738295178045041669876bf32b0543ec8319a5c/llvm/CREDITS.TXT)", "2010 Apple Inc",