diff options
| author | bors <bors@rust-lang.org> | 2023-05-30 00:16:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-30 00:16:46 +0000 |
| commit | 423f081089e6c8610d5edb7fc59cd16661c43de8 (patch) | |
| tree | 46bc3c481c3363968cba20264d2c8070f50338ab | |
| parent | 7ee8fd77ace9ba93b8f97b9b6e7acb5d491fe11f (diff) | |
| parent | 066037b620b3ee72af25a88b626b991b4d522f31 (diff) | |
| download | rust-423f081089e6c8610d5edb7fc59cd16661c43de8.tar.gz rust-423f081089e6c8610d5edb7fc59cd16661c43de8.zip | |
Auto merge of #10824 - klensy:url-no-serde, r=giraffate
deps: drop serde feature from url, drop rustc-workspace-hack Cargo now have it's own workspace and rustc dropped [`rustc-workspace-hack`](https://github.com/rust-lang/rust/pull/109133), so no need to unify features here; drop rustc-workspace-hack. changelog: none
| -rw-r--r-- | Cargo.toml | 5 | ||||
| -rw-r--r-- | clippy_lints/Cargo.toml | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Cargo.toml b/Cargo.toml index 3c72bb62ed1..257d067dcd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,11 +35,6 @@ walkdir = "2.3" # This is used by the `collect-metadata` alias. filetime = "0.2" -# 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" - # UI test dependencies clap = { version = "4.1.4", features = ["derive"] } clippy_utils = { path = "clippy_utils" } diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index 1b818e8ab64..01cefc32a4d 100644 --- a/clippy_lints/Cargo.toml +++ b/clippy_lints/Cargo.toml @@ -26,9 +26,7 @@ unicode-normalization = "0.1" unicode-script = { version = "0.5", default-features = false } semver = "1.0" rustc-semver = "1.1" -# NOTE: cargo requires serde feat in its url dep -# see <https://github.com/rust-lang/rust/pull/63587#issuecomment-522343864> -url = { version = "2.2", features = ["serde"] } +url = "2.2" [features] deny-warnings = ["clippy_utils/deny-warnings"] |