summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-16 12:56:46 +0000
committerbors <bors@rust-lang.org>2018-11-16 12:56:46 +0000
commit4e5ef22258dc1733cdcb84d9ecf71310aeebd23f (patch)
tree3e868bfa60a49931c0531702eed7bbec96b3bea2
parent5cc006652a242c35b6fe5b615ccd39d9356a2346 (diff)
parenteb09cfe4b6fd292632a997dc3dd8a60acd8a31e1 (diff)
downloadrust-libc-4e5ef22258dc1733cdcb84d9ecf71310aeebd23f.tar.gz
Auto merge of #1123 - newpavlov:patch-1, r=gnzlbg
Use OR in the license field According to [The Manifest Format](https://doc.rust-lang.org/cargo/reference/manifest.html): >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.
-rw-r--r--Cargo.toml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Cargo.toml b/Cargo.toml
index ac9c1618eb..719470d383 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@
name = "libc"
version = "0.2.43"
authors = ["The Rust Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-lang/libc"
homepage = "https://github.com/rust-lang/libc"