Skip to content
Permalink
Browse files

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.
  • Loading branch information...
alexcrichton committed Jun 5, 2019
1 parent 817d2fe commit f708228508f29983e7d936e9b0388b0e64a51512
Showing with 9 additions and 1 deletion.
  1. +1 −0 src/bootstrap/tool.rs
  2. +8 −1 src/tools/rustc-workspace-hack/Cargo.toml
@@ -84,6 +84,7 @@ impl Step for ToolBuild {
| "cargo"
| "clippy-driver"
| "miri"
| "rustfmt"
=> {}

_ => return,
@@ -26,19 +26,22 @@ features = [
"basetsd",
"consoleapi",
"errhandlingapi",
"ioapiset",
"jobapi",
"jobapi2",
"knownfolders",
"lmcons",
"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]

0 comments on commit f708228

Please sign in to comment.
You can’t perform that action at this time.