Auto merge of #4922 - oli-cosmian:patch-1, r=flip1995

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 3a3e225db58e99b852b9f9ee18a9927ac852f236..6b757ac0a2fc6efee8316ca6e02d51b0be3babd4 100644 (file)
--- 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"
@@ -22,11 +22,6 @@ publish = false
 travis-ci = { repository = "rust-lang/rust-clippy" }
 appveyor = { repository = "rust-lang/rust-clippy" }
 
-[lib]
-name = "clippy"
-plugin = true
-test = false
-
 [[bin]]
 name = "cargo-clippy"
 test = false
@@ -43,10 +38,14 @@ clippy_lints = { version = "0.0.212", path = "clippy_lints" }
 regex = "1"
 semver = "0.9"
 rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
+git2 = { version = "0.10", optional = true }
+tempfile = { version = "3.1.0", optional = true }
+lazy_static = "1.0"
 
 [dev-dependencies]
-cargo_metadata = "0.7.1"
-compiletest_rs = { version = "0.3.22", features = ["tmp"] }
+cargo_metadata = "0.9.0"
+compiletest_rs = { version = "0.4.0", features = ["tmp"] }
+tester = "0.7"
 lazy_static = "1.0"
 clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }
 serde = { version = "1.0", features = ["derive"] }
@@ -61,4 +60,5 @@ rustc-workspace-hack = "1.0.0"
 rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
 
 [features]
-debugging = []
+deny-warnings = []
+integration = ["git2", "tempfile"]