about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Cargo.toml2
-rw-r--r--README.md2
-rw-r--r--clippy_dummy/Cargo.toml2
-rw-r--r--clippy_lints/Cargo.toml2
-rw-r--r--clippy_lints/src/cargo_common_metadata.rs2
-rw-r--r--mini-macro/Cargo.toml2
-rw-r--r--rustc_tools_util/Cargo.toml2
7 files changed, 7 insertions, 7 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 7ab20320e7d..73568c8a445 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ authors = [
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 keywords = ["clippy", "lint", "plugin"]
 categories = ["development-tools", "development-tools::cargo-plugins"]
 build = "build.rs"
diff --git a/README.md b/README.md
index 3ccf5fcc250..0011fb9cd30 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.com/rust-lang/rust-clippy.svg?branch=master)](https://travis-ci.com/rust-lang/rust-clippy)
 [![Windows Build status](https://ci.appveyor.com/api/projects/status/id677xpw1dguo7iw?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/rust-clippy)
-[![License: MIT/Apache-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
+[![License: MIT OR Apache-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
 
 A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
 
diff --git a/clippy_dummy/Cargo.toml b/clippy_dummy/Cargo.toml
index fb426a4ad2d..064fd8a6ff7 100644
--- a/clippy_dummy/Cargo.toml
+++ b/clippy_dummy/Cargo.toml
@@ -9,7 +9,7 @@ build = 'build.rs'
 
 repository = "https://github.com/rust-lang/rust-clippy"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 keywords = ["clippy", "lint", "plugin"]
 categories = ["development-tools", "development-tools::cargo-plugins"]
 
diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml
index 423e13e9dd5..1c6d829d4ac 100644
--- a/clippy_lints/Cargo.toml
+++ b/clippy_lints/Cargo.toml
@@ -12,7 +12,7 @@ authors = [
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
-license = "MPL-2.0"
+license = "MIT OR Apache-2.0"
 keywords = ["clippy", "lint", "plugin"]
 edition = "2018"
 
diff --git a/clippy_lints/src/cargo_common_metadata.rs b/clippy_lints/src/cargo_common_metadata.rs
index cfc70de8f21..380ad77e62f 100644
--- a/clippy_lints/src/cargo_common_metadata.rs
+++ b/clippy_lints/src/cargo_common_metadata.rs
@@ -27,7 +27,7 @@ declare_clippy_lint! {
     /// description = "A bunch of helpful lints to avoid common pitfalls in Rust"
     /// repository = "https://github.com/rust-lang/rust-clippy"
     /// readme = "README.md"
-    /// license = "MIT/Apache-2.0"
+    /// license = "MIT OR Apache-2.0"
     /// keywords = ["clippy", "lint", "plugin"]
     /// categories = ["development-tools", "development-tools::cargo-plugins"]
     /// ```
diff --git a/mini-macro/Cargo.toml b/mini-macro/Cargo.toml
index a21e7fec6d4..75ab17588a7 100644
--- a/mini-macro/Cargo.toml
+++ b/mini-macro/Cargo.toml
@@ -8,7 +8,7 @@ authors = [
 	"Martin Carton <cartonmartin@gmail.com>",
 	"Oliver Schneider <clippy-iethah7aipeen8neex1a@oli-obk.de>"
 ]
-license = "MPL-2.0"
+license = "MIT OR Apache-2.0"
 description = "A macro to test clippy's procedural macro checks"
 repository = "https://github.com/rust-lang/rust-clippy"
 edition = "2018"
diff --git a/rustc_tools_util/Cargo.toml b/rustc_tools_util/Cargo.toml
index 43e14ea174d..5d37f935375 100644
--- a/rustc_tools_util/Cargo.toml
+++ b/rustc_tools_util/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Matthias Krüger <matthias.krueger@famsik.de>"]
 description = "small helper to generate version information for git packages"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 keywords = ["rustc", "tool", "git", "version", "hash"]
 categories = ["development-tools"]
 edition = "2018"