Skip to content

Commit 6ec16a4

Browse files
authored
Rollup merge of rust-lang#151702 - xtqqczze:omit-copyright-notice, r=jieyouxu
Omit standard copyright notice Remove copyright notices for files licensed under the standard terms (MIT OR Apache-2.0).
2 parents 3b89fc6 + abcd22d commit 6ec16a4

File tree

6 files changed

+2
-15
lines changed

6 files changed

+2
-15
lines changed

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ path = [
5353
]
5454
precedence = "override"
5555
SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)"
56-
SPDX-License-Identifier = "MIT or Apache-2.0"
56+
SPDX-License-Identifier = "MIT OR Apache-2.0"
5757

5858
[[annotations]]
5959
path = "compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp"

compiler/rustc_codegen_gcc/example/alloc_system.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// SPDX-License-Identifier: MIT OR Apache-2.0
2-
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
3-
41
#![no_std]
52
#![feature(allocator_api, rustc_private)]
63

src/doc/rustc-dev-guide/src/conventions.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ These use a pinned version of `ruff`, to avoid relying on the local environment.
7676
<!-- REUSE-IgnoreEnd -->
7777

7878
In the past, files began with a copyright and license notice.
79-
Please **omit** this notice for new files licensed under the standard terms (dual
80-
MIT/Apache-2.0).
79+
Please **omit** this notice for new files licensed under the standard terms (MIT OR Apache-2.0).
8180

8281
All of the copyright notices should be gone by now, but if you come across one
8382
in the rust-lang/rust repo, feel free to open a PR to remove it.

src/tools/miri/tests/pass/intrinsics/integer.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// SPDX-License-Identifier: MIT OR Apache-2.0
2-
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
3-
41
#![feature(core_intrinsics, funnel_shifts)]
52
use std::intrinsics::*;
63

src/tools/miri/tests/pass/issues/issue-30530.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// SPDX-License-Identifier: MIT OR Apache-2.0
2-
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
3-
41
// Regression test for Issue #30530: alloca's created for storing
52
// intermediate scratch values during brace-less match arms need to be
63
// initialized with their drop-flag set to "dropped" (or else we end

src/tools/miri/tests/pass/tag-align-dyn-u64.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// SPDX-License-Identifier: MIT OR Apache-2.0
2-
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
3-
41
use std::mem;
52

63
enum Tag<A> {

0 commit comments

Comments
 (0)