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:
Mazdak Farrokhzad 2019-06-06 13:19:25 +02:00 committed by GitHub
commit face682c82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions

View file

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

View file

@ -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]