X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=1cec4a84480c43a4215d10ea2fc3f3b3d227f580;hb=cc4e434854a982e22ca207c298e63f88dc5128aa;hp=4400f4c0aadb3b5f3c31d3491d5482612ed163e0;hpb=004b885c0afe34d6f8e6649f1faa8bbef656172c;p=rust.git diff --git a/Cargo.toml b/Cargo.toml index 4400f4c0aad..1cec4a84480 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,68 +1,118 @@ -[package] -name = "clippy" -version = "0.1.67" -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 = "2021" -publish = false +[workspace] +members = [ + "compiler/rustc", + "library/std", + "library/test", + "src/rustdoc-json-types", + "src/tools/cargotest", + "src/tools/clippy", + "src/tools/clippy/clippy_dev", + "src/tools/compiletest", + "src/tools/error_index_generator", + "src/tools/linkchecker", + "src/tools/lint-docs", + "src/tools/miropt-test-tools", + "src/tools/rustbook", + "src/tools/unstable-book-gen", + "src/tools/tidy", + "src/tools/tier-check", + "src/tools/build-manifest", + "src/tools/remote-test-client", + "src/tools/remote-test-server", + "src/tools/rust-installer", + "src/tools/rust-demangler", + "src/tools/cargo", + "src/tools/cargo/crates/credential/cargo-credential-1password", + "src/tools/cargo/crates/credential/cargo-credential-macos-keychain", + "src/tools/cargo/crates/credential/cargo-credential-wincred", + "src/tools/cargo/crates/mdman", + # "src/tools/cargo/crates/resolver-tests", + "src/tools/rustdoc", + "src/tools/rls", + "src/tools/rustfmt", + "src/tools/miri", + "src/tools/miri/cargo-miri", + "src/tools/rustdoc-themes", + "src/tools/unicode-table-generator", + "src/tools/expand-yaml-anchors", + "src/tools/jsondocck", + "src/tools/jsondoclint", + "src/tools/html-checker", + "src/tools/bump-stage0", + "src/tools/replace-version-placeholder", + "src/tools/lld-wrapper", + "src/tools/collect-license-metadata", + "src/tools/generate-copyright", +] -[[bin]] -name = "cargo-clippy" -test = false -path = "src/main.rs" +exclude = [ + "build", + "compiler/rustc_codegen_cranelift", + "compiler/rustc_codegen_gcc", + "src/bootstrap", + "src/test/rustdoc-gui", + # HACK(eddyb) This hardcodes the fact that our CI uses `/checkout/obj`. + "obj", + # The `x` binary is a thin wrapper that calls `x.py`, which initializes + # submodules, before which workspace members cannot be invoked because + # not all `Cargo.toml` files are available, so we exclude the `x` binary, + # so it can be invoked before the current checkout is set up. + "src/tools/x", + # stdarch has its own Cargo workspace + "library/stdarch", +] -[[bin]] -name = "clippy-driver" -path = "src/driver.rs" +[profile.release.package.compiler_builtins] +# The compiler-builtins crate cannot reference libcore, and it's own CI will +# verify that this is the case. This requires, however, that the crate is built +# without overflow checks and debug assertions. Forcefully disable debug +# assertions and overflow checks here which should ensure that even if these +# assertions are enabled for libstd we won't enable them for compiler_builtins +# which should ensure we still link everything correctly. +debug-assertions = false +overflow-checks = false -[dependencies] -clippy_lints = { path = "clippy_lints" } -semver = "1.0" -rustc_tools_util = "0.3.0" -tempfile = { version = "3.2", optional = true } -termize = "0.1" +# For compiler-builtins we always use a high number of codegen units. +# The goal here is to place every single intrinsic into its own object +# file to avoid symbol clashes with the system libgcc if possible. Note +# that this number doesn't actually produce this many object files, we +# just don't create more than this number of object files. +# +# It's a bit of a bummer that we have to pass this here, unfortunately. +# Ideally this would be specified through an env var to Cargo so Cargo +# knows how many CGUs are for this specific crate, but for now +# per-crate configuration isn't specifiable in the environment. +codegen-units = 10000 -[dev-dependencies] -compiletest_rs = { version = "0.9", features = ["tmp"] } -tester = "0.9" -regex = "1.5" -toml = "0.5" -walkdir = "2.3" -# This is used by the `collect-metadata` alias. -filetime = "0.2" +[profile.release.package.rustc-rayon-core] +# The rustc fork of Rayon has deadlock detection code which intermittently +# causes overflows in the CI (see https://github.com/rust-lang/rust/issues/90227) +# so we turn overflow checks off for now. +# FIXME: This workaround should be removed once #90227 is fixed. +overflow-checks = false -# 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" +# These dependencies of the standard library implement symbolication for +# backtraces on most platforms. Their debuginfo causes both linking to be slower +# (more data to chew through) and binaries to be larger without really all that +# much benefit. This section turns them all to down to have no debuginfo which +# helps to improve link times a little bit. +[profile.release.package] +addr2line.debug = 0 +adler.debug = 0 +gimli.debug = 0 +miniz_oxide.debug = 0 +object.debug = 0 -# UI test dependencies -clap = { version = "3.1", features = ["derive"] } -clippy_utils = { path = "clippy_utils" } -derive-new = "0.5" -if_chain = "1.0" -itertools = "0.10.1" -quote = "1.0" -serde = { version = "1.0.125", features = ["derive"] } -syn = { version = "1.0", features = ["full"] } -futures = "0.3" -parking_lot = "0.12" -tokio = { version = "1", features = ["io-util"] } -rustc-semver = "1.1" +[patch.crates-io] +# 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 = "0.3.0" +# See comments in `library/rustc-std-workspace-core/README.md` for what's going on +# here +rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' } +rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' } +rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } -[features] -deny-warnings = ["clippy_lints/deny-warnings"] -integration = ["tempfile"] -internal = ["clippy_lints/internal", "tempfile"] - -[package.metadata.rust-analyzer] -# This package uses #[feature(rustc_private)] -rustc_private = true +[patch."https://github.com/rust-lang/rust-clippy"] +clippy_lints = { path = "src/tools/clippy/clippy_lints" }