Merge commit '43a1777b89cf6791f9e20878b4e5e3ae907867a5' into clippyup

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 798b713a07f67b2a76562588f79c3df08f50c63a..6999b6bd74040746afb6ac394a436d65ac05d4e3 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition"]
-
 [package]
 name = "clippy"
 version = "0.0.212"
@@ -11,22 +9,14 @@ authors = [
        "Oliver Schneider <clippy-iethah7aipeen8neex1a@oli-obk.de>"
 ]
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
-repository = "https://github.com/rust-lang-nursery/rust-clippy"
+repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
-license = "MPL-2.0"
+license = "MIT OR Apache-2.0"
 keywords = ["clippy", "lint", "plugin"]
 categories = ["development-tools", "development-tools::cargo-plugins"]
 build = "build.rs"
 edition = "2018"
-
-[badges]
-travis-ci = { repository = "rust-lang-nursery/rust-clippy" }
-appveyor = { repository = "rust-lang-nursery/rust-clippy" }
-
-[lib]
-name = "clippy"
-plugin = true
-test = false
+publish = false
 
 [[bin]]
 name = "cargo-clippy"
@@ -35,23 +25,24 @@ path = "src/main.rs"
 
 [[bin]]
 name = "clippy-driver"
-test = false
 path = "src/driver.rs"
 
 [dependencies]
 # 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.5"
-compiletest_rs = "0.3.7"
+cargo_metadata = "0.9.0"
+compiletest_rs = { version = "0.5.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.
@@ -59,5 +50,9 @@ derive-new = "0.5"
 # for more information.
 rustc-workspace-hack = "1.0.0"
 
+[build-dependencies]
+rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
+
 [features]
-debugging = []
+deny-warnings = []
+integration = ["tempfile"]