Skip to content

Commit ed8dfce

Browse files
committed
Auto merge of #5074 - CAD97:patch-1, r=alexcrichton
Separate licenses with a `/` instead of ` OR ` It's what we tell others to do. https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata > ```toml > # This is a string description of the license for this package. Currently > # crates.io will validate the license provided against a whitelist of known > # license identifiers from http://spdx.org/licenses/. Multiple licenses can be > # separated with a `/`. > license = "..." > ``` Noted [here](TeXitoi/structopt#71 (comment)). This should either use `/` or a note should be added that ` OR ` is allowed as a combination operator.
2 parents 6cfd4e2 + 1ddba76 commit ed8dfce

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
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 OR Apache-2.0"
7+
license = "MIT/Apache-2.0"
88
homepage = "https://crates.io"
99
repository = "https://github.com/rust-lang/cargo"
1010
documentation = "https://docs.rs/cargo"
@@ -91,4 +91,4 @@ doc = false
9191

9292
[[test]]
9393
name = "testsuite"
94-
path = "tests/testsuite/lib.rs"
94+
path = "tests/testsuite/lib.rs"

0 commit comments

Comments
 (0)