Skip to content

Commit af21690

Browse files
committed
Auto merge of #1322 - steffengy:master, r=alexcrichton
migrate to winapi 0.3 - [x] Some of those changes should also be applied to cargo, to keep those common files consistent. filed rust-lang/cargo#4877
2 parents 17aa5b5 + 4ffb8f5 commit af21690

File tree

17 files changed

+137
-190
lines changed

17 files changed

+137
-190
lines changed

Cargo.lock

Lines changed: 27 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,9 @@ url = "1.1.0"
5656
wait-timeout = "0.1.5"
5757

5858
[target."cfg(windows)".dependencies]
59-
winapi = "0.2.8"
59+
winapi = { version = "0.3", features = ["jobapi", "jobapi2", "processthreadsapi", "psapi", "synchapi", "winuser"] }
6060
winreg = "0.4.0"
61-
user32-sys = "0.2.0"
62-
kernel32-sys = "0.2.1"
6361
gcc = "0.3.50"
64-
psapi-sys = "0.1"
6562

6663
[dev-dependencies]
6764
rustup-mock = { path = "src/rustup-mock", version = "1.1.0" }

0 commit comments

Comments
 (0)