Skip to content

Commit 5972408

Browse files
authored
Rollup merge of rust-lang#60685 - dtolnay:spdx, r=nikomatsakis
Switch to SPDX 2.1 license expression [According to the Cargo Reference:](https://doc.rust-lang.org/cargo/reference/manifest.html) > This is an SPDX 2.1 license expression for this package. Currently crates.io will validate the license provided against a whitelist of known license and exception identifiers from the SPDX license list 2.4. Parentheses are not currently supported. > > Multiple licenses can be separated with a \`/\`, although that usage is deprecated. Instead, use a license expression with AND and OR operators to get more explicit semantics. The notation with slashes is deprecated in favor of explicit AND or OR. As I understand it, Rust's license is MIT *OR* Apache-2.0 matching the meaning of *OR* defined by [SPDX Specification 2.1](https://spdx.org/spdx-specification-21-web-version): > If presented with a choice between two or more licenses, use the disjunctive binary "OR" operator to construct a new license expression, where both the left and right operands are valid license expression values.
2 parents 4f53b5c + 08cd34e commit 5972408

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/libstd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ authors = ["The Rust Project Developers"]
33
name = "std"
44
version = "0.0.0"
55
build = "build.rs"
6-
license = "MIT/Apache-2.0"
6+
license = "MIT OR Apache-2.0"
77
repository = "https://github.com/rust-lang/rust.git"
88
description = "The Rust Standard Library"
99
edition = "2018"

src/tools/rustbook/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["The Rust Project Developers"]
33
name = "rustbook"
44
version = "0.1.0"
5-
license = "MIT/Apache-2.0"
5+
license = "MIT OR Apache-2.0"
66
edition = "2018"
77

88
[dependencies]

src/tools/rustc-std-workspace-alloc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "rustc-std-workspace-alloc"
33
version = "1.0.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
license = 'MIT/Apache-2.0'
5+
license = 'MIT OR Apache-2.0'
66
description = """
77
Hack for the compiler's own build system
88
"""

src/tools/rustc-std-workspace-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "rustc-std-workspace-core"
33
version = "1.0.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
license = 'MIT/Apache-2.0'
5+
license = 'MIT OR Apache-2.0'
66
description = """
77
Hack for the compiler's own build system
88
"""

src/tools/rustc-workspace-hack/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "rustc-workspace-hack"
33
version = "1.0.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
license = 'MIT/Apache-2.0'
5+
license = 'MIT OR Apache-2.0'
66
description = """
77
Hack for the compiler's own build system
88
"""

src/tools/unstable-book-gen/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ authors = ["est31 <[email protected]>",
33
"The Rust Project Developers"]
44
name = "unstable-book-gen"
55
version = "0.1.0"
6-
license = "MIT/Apache-2.0"
6+
license = "MIT OR Apache-2.0"
77
edition = "2018"
88

99
[dependencies]

0 commit comments

Comments
 (0)