Skip to content

Commit face682

Browse files
authored
Rollup merge of rust-lang#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.
2 parents 59690f4 + f708228 commit face682

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Diff for: src/bootstrap/tool.rs

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ impl Step for ToolBuild {
8484
| "cargo"
8585
| "clippy-driver"
8686
| "miri"
87+
| "rustfmt"
8788
=> {}
8889

8990
_ => return,

Diff for: src/tools/rustc-workspace-hack/Cargo.toml

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@ features = [
2626
"basetsd",
2727
"consoleapi",
2828
"errhandlingapi",
29+
"ioapiset",
2930
"jobapi",
3031
"jobapi2",
3132
"knownfolders",
3233
"lmcons",
3334
"memoryapi",
3435
"minschannel",
3536
"minwinbase",
37+
"namedpipeapi",
38+
"ntdef",
3639
"ntsecapi",
3740
"ntstatus",
3841
"objbase",
39-
"profileapi",
4042
"processenv",
4143
"processthreadsapi",
44+
"profileapi",
4245
"psapi",
4346
"schannel",
4447
"securitybaseapi",
@@ -53,6 +56,10 @@ features = [
5356
"winbase",
5457
"wincon",
5558
"wincrypt",
59+
"winsock2",
60+
"ws2def",
61+
"ws2ipdef",
62+
"ws2tcpip",
5663
]
5764

5865
[dependencies]

0 commit comments

Comments
 (0)