Skip to content

Commit b33172a

Browse files
committed
replace legacy copyright annotations in submodules
1 parent 9b5ded9 commit b33172a

File tree

11 files changed

+14
-99
lines changed

11 files changed

+14
-99
lines changed

compiler/rustc_codegen_cranelift/example/alloc_system.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
3+
104
#![no_std]
115

126
pub struct System;

compiler/rustc_codegen_gcc/example/alloc_system.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
3+
104
#![no_std]
115
#![feature(allocator_api, rustc_private)]
126
#![cfg_attr(any(unix, target_os = "redox"), feature(libc))]

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
103

114
#![feature(core_intrinsics)]
125
use std::intrinsics::*;

src/tools/miri/tests/pass/intrinsics-math.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
103

114
macro_rules! assert_approx_eq {
125
($a:expr, $b:expr) => {{

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
// Copyright 2012-2016 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
103

114
// Regression test for Issue #30530: alloca's created for storing
125
// intermediate scratch values during brace-less match arms need to be

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
// SPDX-FileCopyrightText: The Rust Project Developers (see https://thanks.rust-lang.org)
103

114
use std::mem;
125

src/tools/rust-installer/combine-installers.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
#!/bin/bash
2-
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3-
# file at the top-level directory of this distribution and at
4-
# http://rust-lang.org/COPYRIGHT.
5-
#
6-
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7-
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8-
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9-
# option. This file may not be copied, modified, or distributed
10-
# except according to those terms.
112

123
set -ue
134

src/tools/rust-installer/gen-install-script.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
#!/bin/bash
2-
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3-
# file at the top-level directory of this distribution and at
4-
# http://rust-lang.org/COPYRIGHT.
5-
#
6-
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7-
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8-
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9-
# option. This file may not be copied, modified, or distributed
10-
# except according to those terms.
112

123
set -ue
134

src/tools/rust-installer/gen-installer.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
#!/bin/bash
2-
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3-
# file at the top-level directory of this distribution and at
4-
# http://rust-lang.org/COPYRIGHT.
5-
#
6-
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7-
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8-
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9-
# option. This file may not be copied, modified, or distributed
10-
# except according to those terms.
112

123
set -ue
134

src/tools/rust-installer/install-template.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
#!/bin/bash
2-
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3-
# file at the top-level directory of this distribution and at
4-
# http://rust-lang.org/COPYRIGHT.
5-
#
6-
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7-
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8-
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9-
# option. This file may not be copied, modified, or distributed
10-
# except according to those terms.
112

123
# No undefined variables
134
set -u

src/tools/rust-installer/make-tarballs.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
#!/bin/sh
2-
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3-
# file at the top-level directory of this distribution and at
4-
# http://rust-lang.org/COPYRIGHT.
5-
#
6-
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7-
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8-
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9-
# option. This file may not be copied, modified, or distributed
10-
# except according to those terms.
112

123
set -ue
134

0 commit comments

Comments
 (0)