X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=6b757ac0a2fc6efee8316ca6e02d51b0be3babd4;hb=961c1a5df2aa20e92ee6a8f277f384fd4249366d;hp=3d36e52d2df81c2682da0c8d245a352d1625c805;hpb=a9d002c8a53be53aab6c754b011fb699e2f51aa0;p=rust.git

diff --git a/Cargo.toml b/Cargo.toml
index 3d36e52d2df..6b757ac0a2f 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"
@@ -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
@@ -42,17 +37,18 @@ clippy_lints = { version = "0.0.212", path = "clippy_lints" }
 # end automatic update
 regex = "1"
 semver = "0.9"
-rustc_tools_util = { version = "0.1.1", path = "rustc_tools_util"}
+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]
-clippy_dev = { version = "0.0.1", path = "clippy_dev" }
-cargo_metadata = "0.7.1"
-compiletest_rs = { version = "=0.3.19", features = ["tmp", "stable"] }
-libtest = "0.0.1"
+cargo_metadata = "0.9.0"
+compiletest_rs = { version = "0.4.0", features = ["tmp"] }
+tester = "0.7"
 lazy_static = "1.0"
-serde_derive = "1.0"
 clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }
-serde = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 derive-new = "0.5"
 
 # A noop dependency that changes in the Rust repository, it's a bit of a hack.
@@ -61,7 +57,8 @@ derive-new = "0.5"
 rustc-workspace-hack = "1.0.0"
 
 [build-dependencies]
-rustc_tools_util = { version = "0.1.1", path = "rustc_tools_util"}
+rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
 
 [features]
-debugging = []
+deny-warnings = []
+integration = ["git2", "tempfile"]