diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-06 13:19:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 13:19:25 +0200 |
| commit | face682c82a64e0f21738d7cb2a6eaa026c207c2 (patch) | |
| tree | 92c69c17d599c9889edc607eb98af2effeaad5b3 /src | |
| parent | 59690f43953b191344b8ba85b10b44595f774921 (diff) | |
| parent | f708228508f29983e7d936e9b0388b0e64a51512 (diff) | |
| download | rust-face682c82a64e0f21738d7cb2a6eaa026c207c2.tar.gz rust-face682c82a64e0f21738d7cb2a6eaa026c207c2.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/tool.rs | 1 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 3b6f02c9368..83a897f1ab7 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -84,6 +84,7 @@ impl Step for ToolBuild { | "cargo" | "clippy-driver" | "miri" + | "rustfmt" => {} _ => return, diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 18d682640db..74720061122 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -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] |