Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't download dependencies from other platforms #3123

Merged
merged 2 commits into from
Sep 27, 2016
Merged

Don't download dependencies from other platforms #3123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fb5302
add test cfg/ignore_version_from_other_platform
wimh Sep 26, 2016
0a4fbbf
Do not download dependencies from other platforms
wimh Sep 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_rustc/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
let deps = self.resolve.deps(id);
let mut ret = try!(deps.filter(|dep| {
unit.pkg.dependencies().iter().filter(|d| {
d.name() == dep.name()
d.name() == dep.name() && d.version_req().matches(dep.version())
}).any(|d| {
// If this target is a build command, then we only want build
// dependencies, otherwise we want everything *other than* build
Expand Down
32 changes: 32 additions & 0 deletions tests/cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,38 @@ fn works_through_the_registry() {
"));
}

#[test]
fn ignore_version_from_other_platform() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This unittest is based on the two tests above. Both of them include if !is_nightly() { return }. It seems to work fine on rust 1.11, so I did not include that here.

let this_family = if cfg!(unix) {"unix"} else {"windows"};
let other_family = if cfg!(unix) {"windows"} else {"unix"};
Package::new("foo", "0.1.0").publish();
Package::new("foo", "0.2.0").publish();

let p = project("a")
.file("Cargo.toml", &format!(r#"
[package]
name = "a"
version = "0.0.1"
authors = []

[target.'cfg({})'.dependencies]
foo = "0.1.0"

[target.'cfg({})'.dependencies]
foo = "0.2.0"
"#, this_family, other_family))
.file("src/lib.rs", "extern crate foo;");

assert_that(p.cargo_process("build"),
execs().with_status(0).with_stderr("\
[UPDATING] registry [..]
[DOWNLOADING] [..]
[COMPILING] foo v0.1.0
[COMPILING] a v0.0.1 ([..])
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
"));
}

#[test]
fn bad_target_spec() {
let p = project("a")
Expand Down