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:
Alex Crichton 2019-06-05 12:38:05 -07:00
parent 817d2feb13
commit f708228508
2 changed files with 9 additions and 1 deletions

View file

@ -84,6 +84,7 @@ impl Step for ToolBuild {
| "cargo" | "cargo"
| "clippy-driver" | "clippy-driver"
| "miri" | "miri"
| "rustfmt"
=> {} => {}
_ => return, _ => return,

View file

@ -26,6 +26,7 @@ features = [
"basetsd", "basetsd",
"consoleapi", "consoleapi",
"errhandlingapi", "errhandlingapi",
"ioapiset",
"jobapi", "jobapi",
"jobapi2", "jobapi2",
"knownfolders", "knownfolders",
@ -33,12 +34,14 @@ features = [
"memoryapi", "memoryapi",
"minschannel", "minschannel",
"minwinbase", "minwinbase",
"namedpipeapi",
"ntdef",
"ntsecapi", "ntsecapi",
"ntstatus", "ntstatus",
"objbase", "objbase",
"profileapi",
"processenv", "processenv",
"processthreadsapi", "processthreadsapi",
"profileapi",
"psapi", "psapi",
"schannel", "schannel",
"securitybaseapi", "securitybaseapi",
@ -53,6 +56,10 @@ features = [
"winbase", "winbase",
"wincon", "wincon",
"wincrypt", "wincrypt",
"winsock2",
"ws2def",
"ws2ipdef",
"ws2tcpip",
] ]
[dependencies] [dependencies]