From d743a8992a9271fd371be25811b169586bcfb0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Thu, 3 Oct 2019 19:55:05 +0200 Subject: [PATCH 1/2] Fix license in Cargo.toml files --- clippy_lints/Cargo.toml | 2 +- mini-macro/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index 423e13e9dd5a..16845e970f1d 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/Apache-2.0" keywords = ["clippy", "lint", "plugin"] edition = "2018" diff --git a/mini-macro/Cargo.toml b/mini-macro/Cargo.toml index a21e7fec6d48..76db44c8525a 100644 --- a/mini-macro/Cargo.toml +++ b/mini-macro/Cargo.toml @@ -8,7 +8,7 @@ authors = [ "Martin Carton ", "Oliver Schneider " ] -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" From 4f1d9074623afebfcb0dda9986766e3deeb50838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Fri, 4 Oct 2019 17:39:23 +0200 Subject: [PATCH 2/2] Use new format of licenses Co-Authored-By: lzutao --- Cargo.toml | 2 +- README.md | 2 +- clippy_dummy/Cargo.toml | 2 +- clippy_lints/Cargo.toml | 2 +- clippy_lints/src/cargo_common_metadata.rs | 2 +- mini-macro/Cargo.toml | 2 +- rustc_tools_util/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7ab20320e7dc..73568c8a4452 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 2f7032af87d0..21a878b23891 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 fb426a4ad2d1..064fd8a6ff79 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 16845e970f1d..1c6d829d4ac9 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 = "MIT/Apache-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 cfc70de8f21d..380ad77e62fb 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 76db44c8525a..75ab17588a7f 100644 --- a/mini-macro/Cargo.toml +++ b/mini-macro/Cargo.toml @@ -8,7 +8,7 @@ authors = [ "Martin Carton ", "Oliver Schneider " ] -license = "MIT/Apache-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 43e14ea174d6..5d37f9353754 100644 --- a/rustc_tools_util/Cargo.toml +++ b/rustc_tools_util/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Matthias Krüger "] 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"