Auto merge of #5290 - polybuildr:map-message, r=phansch

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 7ab20320e7dc36aa221475a88de3eccd363933d8..cfcdaf22291cdfd1c97b20bdbd248beb9cd342d7 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"
@@ -43,10 +37,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.12", optional = true }
+tempfile = { version = "3.1.0", optional = true }
+lazy_static = "1.0"
 
 [dev-dependencies]
-cargo_metadata = "0.8.0"
-compiletest_rs = { version = "0.3.23", 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"] }
@@ -62,4 +60,4 @@ rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
 
 [features]
 deny-warnings = []
-debugging = []
+integration = ["git2", "tempfile"]