Skip to content

Commit

Permalink
Auto merge of #10824 - klensy:url-no-serde, r=giraffate
Browse files Browse the repository at this point in the history
deps: drop serde feature from url, drop rustc-workspace-hack

Cargo now have it's own workspace and rustc dropped [`rustc-workspace-hack`](rust-lang/rust#109133), so no need to unify features here; drop rustc-workspace-hack.

changelog: none
  • Loading branch information
bors committed May 30, 2023
2 parents 7ee8fd7 + 066037b commit 423f081
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
5 changes: 0 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
4 changes: 1 addition & 3 deletions clippy_lints/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit 423f081

Please sign in to comment.