X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=7b5e0fa1c281787b2d2cff8aa6dd737fab06c228;hb=2b3b115a4deac7b8c72d0028576cd4c6dbf036d8;hp=8421670a1a465dce0d955d9561180b32efeb1b7e;hpb=204bb9b54b17cef5e5bfba4c4904ab745e6359ba;p=rust.git

diff --git a/Cargo.toml b/Cargo.toml
index 8421670a1a4..7b5e0fa1c28 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,62 +1,69 @@
-[package]
-name = "clippy"
-version = "0.0.212"
-authors = [
-	"Manish Goregaokar <manishsmail@gmail.com>",
-	"Andre Bogus <bogusandre@gmail.com>",
-	"Georg Brandl <georg@python.org>",
-	"Martin Carton <cartonmartin@gmail.com>",
-	"Oliver Schneider <clippy-iethah7aipeen8neex1a@oli-obk.de>"
+[workspace]
+members = [
+  "src/bootstrap",
+  "src/rustc",
+  "src/libstd",
+  "src/libtest",
+  "src/librustc_codegen_llvm",
+  "src/tools/cargotest",
+  "src/tools/clippy",
+  "src/tools/compiletest",
+  "src/tools/error_index_generator",
+  "src/tools/linkchecker",
+  "src/tools/rustbook",
+  "src/tools/unstable-book-gen",
+  "src/tools/tidy",
+  "src/tools/build-manifest",
+  "src/tools/remote-test-client",
+  "src/tools/remote-test-server",
+  "src/tools/rust-installer",
+  "src/tools/cargo",
+  "src/tools/rustdoc",
+  "src/tools/rls",
+  "src/tools/rustfmt",
+  "src/tools/miri",
+  "src/tools/rustdoc-themes",
+  "src/tools/unicode-table-generator",
+  "src/tools/expand-yaml-anchors",
+]
+exclude = [
+  "build",
+  # HACK(eddyb) This hardcodes the fact that our CI uses `/checkout/obj`.
+  "obj",
 ]
-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 OR Apache-2.0"
-keywords = ["clippy", "lint", "plugin"]
-categories = ["development-tools", "development-tools::cargo-plugins"]
-build = "build.rs"
-edition = "2018"
-publish = false
-
-# [badges]
-# FIXME(flip1995): Add GHA badge once rust-lang/crates.io#1838 is merged
-
-[[bin]]
-name = "cargo-clippy"
-test = false
-path = "src/main.rs"
 
-[[bin]]
-name = "clippy-driver"
-path = "src/driver.rs"
+# These options are controlled from our rustc wrapper script, so turn them off
+# here and have them controlled elsewhere.
+[profile.dev]
+debug = false
+debug-assertions = false
+[profile.test]
+debug = false
+debug-assertions = false
 
-[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"
+# We want the RLS to use the version of Cargo that we've got vendored in this
+# repository to ensure that the same exact version of Cargo is used by both the
+# RLS and the Cargo binary itself. The RLS depends on Cargo as a git repository
+# so we use a `[patch]` here to override the github repository with our local
+# vendored copy.
+[patch."https://github.com/rust-lang/cargo"]
+cargo = { path = "src/tools/cargo" }
 
-[dev-dependencies]
-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"] }
-derive-new = "0.5"
+[patch.crates-io]
+# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
+# that we're shipping as well (to ensure that the rustfmt in RLS and the
+# `rustfmt` executable are the same exact version).
+rustfmt-nightly = { path = "src/tools/rustfmt" }
 
-# 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"
+# See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
+# here
+rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }
 
-[build-dependencies]
-rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
+# See comments in `tools/rustc-std-workspace-core/README.md` for what's going on
+# here
+rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }
+rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' }
+rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' }
 
-[features]
-deny-warnings = []
-integration = ["tempfile"]
+[patch."https://github.com/rust-lang/rust-clippy"]
+clippy_lints = { path = "src/tools/clippy/clippy_lints" }