Rollup merge of #5248 - ThibsG:ConstValues, r=flip1995

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index e3e7e965c88d1049fa04dac5d4c30a43daa4f6db..7b07fde43992f57ef108dd454e1d1ebddc7583bf 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,21 +11,15 @@ 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
+# [badges]
+# FIXME(flip1995): Add GHA badge once rust-lang/crates.io#1838 is merged
 
 [[bin]]
 name = "cargo-clippy"
@@ -42,16 +36,17 @@ 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"}
+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.21", features = ["tmp"] }
+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.
@@ -60,7 +55,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 = ["tempfile"]