Skip to content

Commit

Permalink
Auto merge of #5074 - CAD97:patch-1, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Feb 25, 2018
2 parents 6cfd4e2 + 1ddba76 commit ed8dfce
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.26.0"
authors = ["Yehuda Katz <[email protected]>",
"Carl Lerche <[email protected]>",
"Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
license = "MIT/Apache-2.0"
homepage = "https://crates.io"
repository = "https://github.com/rust-lang/cargo"
documentation = "https://docs.rs/cargo"
Expand Down Expand Up @@ -91,4 +91,4 @@ doc = false

[[test]]
name = "testsuite"
path = "tests/testsuite/lib.rs"
path = "tests/testsuite/lib.rs"

0 comments on commit ed8dfce

Please sign in to comment.