rust
/
cargo
mirror of https://github.com/rust-lang/cargo
0
0
Fork 0
Code Issues Releases Wiki Activity

make certain dependencies Windows-only 

Inspired by servo/heapsize#71, we make certain dependencies only
required under Windows.
This commit is contained in:
Nathan Froyd 2017-01-05 16:09:36 -05:00
parent 508d66bca7
commit f6dd5c2e20
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.toml
View File

@ -17,7 +17,6 @@ name = "cargo"
path = "src/cargo/lib.rs"
[dependencies]
advapi32-sys = "0.2"
crates-io = { path = "src/crates-io", version = "0.6" }
crossbeam = "0.2"
curl = "0.4"
@ -29,13 +28,10 @@ fs2 = "0.3"
git2 = "0.6"
git2-curl = "0.7"
glob = "0.2"
kernel32-sys = "0.2"
libc = "0.2"
libgit2-sys = "0.6"
log = "0.3"
miow = "0.1"
num_cpus = "1.0"
psapi-sys = "0.1"
regex = "0.1"
rustc-serialize = "0.3"
semver = "0.5.0"
@ -45,11 +41,17 @@ tempdir = "0.3"
term = "0.4.4"
toml = "0.2"
url = "1.1"
winapi = "0.2"
[target.'cfg(unix)'.dependencies]
openssl = "0.9"
[target.'cfg(windows)'.dependencies]
advapi32-sys = "0.2"
kernel32-sys = "0.2"
miow = "0.1"
psapi-sys = "0.1"
winapi = "0.2"
[dev-dependencies]
hamcrest = "0.1"
bufstream = "0.1"

6
tests/death.rs
View File

@ -1,7 +1,5 @@
extern crate cargotest;
extern crate kernel32;
extern crate libc;
extern crate winapi;
use std::fs;
use std::io::{self, Read};
@ -25,8 +23,8 @@ fn enabled() -> bool {
// can succeed or not.
#[cfg(windows)]
fn enabled() -> bool {
use kernel32;
use winapi;
extern crate kernel32;
extern crate winapi;
unsafe {
// If we're not currently in a job, then we can definitely run these
// tests.