Auto merge of #4616 - mati865:license, r=Manishearth

bors · bors · commit 5ed118f4b4f3 · 2019-10-03T18:02:02.000Z
Fix license in Cargo.toml files Missed in #3269 changelog: none r? @Manishearth
diff --git 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/Apache-2.0"
 keywords = ["clippy", "lint", "plugin"]
 edition = "2018"
 
diff --git 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/Apache-2.0"
 description = "A macro to test clippy's procedural macro checks"
 repository = "https://github.com/rust-lang/rust-clippy"
 edition = "2018"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ authors = [`
`8`	`8`	`"Martin Carton <cartonmartin@gmail.com>",`
`9`	`9`	`"Oliver Schneider <clippy-iethah7aipeen8neex1a@oli-obk.de>"`
`10`	`10`	`]`
`11`		`-license = "MPL-2.0"`
	`11`	`+license = "MIT/Apache-2.0"`
`12`	`12`	`description = "A macro to test clippy's procedural macro checks"`
`13`	`13`	`repository = "https://github.com/rust-lang/rust-clippy"`
`14`	`14`	`edition = "2018"`