about summary refs log tree commit diff
path: root/src/test/ui/thinlto
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-05-17 02:54:11 +0200
committerGitHub <noreply@github.com>2019-05-17 02:54:11 +0200
commit59724084089da63cc2f982372c0fae3551d85fe5 (patch)
treecec14d55f753a3c474df70d6306941f499237983 /src/test/ui/thinlto
parent4f53b5c42baf498b0dd8adbe59aae648a2cf6c14 (diff)
parent08cd34e4fc062345dd20c018384b360cd57915b1 (diff)
downloadrust-59724084089da63cc2f982372c0fae3551d85fe5.tar.gz
rust-59724084089da63cc2f982372c0fae3551d85fe5.zip
Rollup merge of #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.
Diffstat (limited to 'src/test/ui/thinlto')
0 files changed, 0 insertions, 0 deletions