Skip to content

Commit f60ece9

Browse files
committed
Auto merge of #4920 - wking:license-expression, r=matklad
Cargo.toml: Replace '/' with 'OR' in 'license' Catch up with our recommendations from 7dee65f (#4898), which deprecated `/` in favor of vanilla SPDX license expressions. I've gone with the disjunctive `OR`, because the README has: > Cargo is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0).
2 parents c4003c4 + 4977c4c commit f60ece9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.26.0"
44
authors = ["Yehuda Katz <[email protected]>",
55
"Carl Lerche <[email protected]>",
66
"Alex Crichton <[email protected]>"]
7-
license = "MIT/Apache-2.0"
7+
license = "MIT OR Apache-2.0"
88
homepage = "https://crates.io"
99
repository = "https://github.com/rust-lang/cargo"
1010
documentation = "https://docs.rs/cargo"

src/crates-io/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "crates-io"
33
version = "0.15.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
license = "MIT/Apache-2.0"
5+
license = "MIT OR Apache-2.0"
66
repository = "https://github.com/rust-lang/cargo"
77
description = """
88
Helpers for interacting with crates.io

0 commit comments

Comments
 (0)