Merge commit '43a1777b89cf6791f9e20878b4e5e3ae907867a5' into clippyup

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 3a3e225db58e99b852b9f9ee18a9927ac852f236..6999b6bd74040746afb6ac394a436d65ac05d4e3 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,22 +11,13 @@ 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"
 edition = "2018"
 publish = false
 
-[badges]
-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
@@ -40,13 +31,15 @@ path = "src/driver.rs"
 # begin automatic update
 clippy_lints = { version = "0.0.212", path = "clippy_lints" }
 # end automatic update
-regex = "1"
 semver = "0.9"
 rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
+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.5.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 +54,5 @@ rustc-workspace-hack = "1.0.0"
 rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
 
 [features]
-debugging = []
+deny-warnings = []
+integration = ["tempfile"]