Cargo.toml: Replace '/' with 'OR' in 'license'

Catch up with our recommendations from 7dee65fe (src/doc/manifest: Pin
'license' to SPDX 2.1 expressions and the 2.4 list, 2018-01-04,
#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).

diff --git a/Cargo.toml b/Cargo.toml
index 29f3055721a48130dceb1b89fc6846a1e8d3aad5..2907d4cd9064171b768d8b4a59f6248db0aa72eb 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.26.0"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
            "Alex Crichton <alex@alexcrichton.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://crates.io"
 repository = "https://github.com/rust-lang/cargo"
 documentation = "https://docs.rs/cargo"

diff --git a/src/crates-io/Cargo.toml b/src/crates-io/Cargo.toml
index e3c56aaa03c0dbff044ba2fa3440a26b489d1005..03ccdbbee39af78f21b3e4ce3a29afd74a65f3f6 100644 (file)
--- a/src/crates-io/Cargo.toml
+++ b/src/crates-io/Cargo.toml
@@ -2,7 +2,7 @@
 name = "crates-io"
 version = "0.15.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
 description = """
 Helpers for interacting with crates.io