mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-22 02:00:00 +03:00
Rollup merge of #61557 - alexcrichton:build-less, r=pietroalbini
rustbuild: Include `rustfmt` in deduplicated dependencies Currently `rustfmt` is excluded from the "don't build dependencies twice" check but it's currently building dependencies twice! Namely big dependencies like `rustc-ap-syntax` are built once for rustfmt and once for the RLS. This commit includes `rustfmt` in these checks and then fixes the resulting feature mismatches for winapi.
This commit is contained in:
@@ -84,6 +84,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
|
||||
| "cargo"
|
||||
| "clippy-driver"
|
||||
| "miri"
|
||||
| "rustfmt"
|
||||
=> {}
|
||||
|
||||
_ => return,
|
||||
|
||||
@@ -26,6 +26,7 @@ features = [
|
||||
"basetsd",
|
||||
"consoleapi",
|
||||
"errhandlingapi",
|
||||
"ioapiset",
|
||||
"jobapi",
|
||||
"jobapi2",
|
||||
"knownfolders",
|
||||
@@ -33,12 +34,14 @@ features = [
|
||||
"memoryapi",
|
||||
"minschannel",
|
||||
"minwinbase",
|
||||
"namedpipeapi",
|
||||
"ntdef",
|
||||
"ntsecapi",
|
||||
"ntstatus",
|
||||
"objbase",
|
||||
"profileapi",
|
||||
"processenv",
|
||||
"processthreadsapi",
|
||||
"profileapi",
|
||||
"psapi",
|
||||
"schannel",
|
||||
"securitybaseapi",
|
||||
@@ -53,6 +56,10 @@ features = [
|
||||
"winbase",
|
||||
"wincon",
|
||||
"wincrypt",
|
||||
"winsock2",
|
||||
"ws2def",
|
||||
"ws2ipdef",
|
||||
"ws2tcpip",
|
||||
]
|
||||
|
||||
[dependencies]
|
||||
|
||||
Reference in New Issue
Block a user