Merge pull request #3394 from phansch/rustup

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 7c9fe25123760d7d419e1bf752ff014076f024ae..2293913f38e76de4c2f044cb4578a18f8e599c69 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition"]
-
 [package]
 name = "clippy"
 version = "0.0.212"
@@ -13,11 +11,12 @@ authors = [
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang-nursery/rust-clippy"
 readme = "README.md"
-license = "MPL-2.0"
+license = "MIT/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-nursery/rust-clippy" }
@@ -44,59 +43,25 @@ clippy_lints = { version = "0.0.212", path = "clippy_lints" }
 # end automatic update
 regex = "1"
 semver = "0.9"
-
-# Not actually needed right now but required to make sure that clippy/ and cargo build
-# with the same set of features in rust-lang/rust
-num-traits = "0.2" # enable the default feature
-backtrace = "0.3"
-
-# keep in sync with `cargo`'s `Cargo.toml'
-[target.'cfg(windows)'.dependencies.winapi]
-version = "0.3"
-features = [
-  # keep in sync with `cargo`'s `Cargo.toml'
-  "handleapi",
-  "jobapi",
-  "jobapi2",
-  "minwindef",
-  "ntdef",
-  "ntstatus",
-  "processenv",
-  "processthreadsapi",
-  "psapi",
-  "synchapi",
-  "winerror",
-  "winbase",
-  "wincon",
-  "winnt",
-  # no idea where these come from
-  "basetsd",
-  "lmcons",
-  "memoryapi",
-  "minschannel",
-  "minwinbase",
-  "ntsecapi",
-  "profileapi",
-  "schannel",
-  "securitybaseapi",
-  "synchapi",
-  "sysinfoapi",
-  "timezoneapi",
-  "wincrypt",
-]
+rustc_tools_util = { version = "0.1.0", path = "rustc_tools_util"}
 
 [dev-dependencies]
-cargo_metadata = "0.5"
-compiletest_rs = "0.3.7"
+clippy_dev = { version = "0.0.1", path = "clippy_dev" }
+cargo_metadata = "0.6"
+compiletest_rs = "0.3.16"
 lazy_static = "1.0"
 serde_derive = "1.0"
 clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }
 serde = "1.0"
 derive-new = "0.5"
 
+# A noop dependency that changes in the Rust repository, it's a bit of a hack.
+# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
+# for more information.
+rustc-workspace-hack = "1.0.0"
+
 [build-dependencies]
-rustc_version = "0.2.2"
-ansi_term = "0.11"
+rustc_tools_util = { version = "0.1.0", path = "rustc_tools_util"}
 
 [features]
 debugging = []