mirror of
https://github.com/rust-lang/cargo
synced 2024-10-13 19:22:33 +00:00
51d235606a
This commit is directed at fixing #4127, allowing the resolver to automatically perform transitive updates when required. A few use casese and tagged links are hanging off #4127 itself, but the crux of the issue happens when you either add a dependency or update a version requirement in `Cargo.toml` which conflicts with something listed in your `Cargo.lock`. In this case Cargo would previously provide an obscure "cannot resolve" error whereas this commit updates Cargo to automatically perform a conservative re-resolution of the dependency graph. It's hoped that this commit will help reduce the number of "unresolvable" dependency graphs we've seen in the wild and otherwise make Cargo a little more ergonomic to use as well. More details can be found in the source's comments! Closes #4127 Closes #5182
1628 lines
36 KiB
Rust
1628 lines
36 KiB
Rust
use cargotest::support::git;
|
|
use cargotest::support::paths;
|
|
use cargotest::support::registry::Package;
|
|
use cargotest::support::{execs, project};
|
|
use hamcrest::assert_that;
|
|
|
|
#[test]
|
|
fn override_simple() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file(
|
|
"src/lib.rs",
|
|
"
|
|
extern crate foo;
|
|
pub fn bar() {
|
|
foo::foo();
|
|
}
|
|
",
|
|
)
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `file://[..]`
|
|
[UPDATING] git repository `[..]`
|
|
[COMPILING] foo v0.1.0 (file://[..])
|
|
[COMPILING] local v0.0.1 (file://[..])
|
|
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn missing_version() {
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
foo = { git = 'https://example.com' }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(101).with_stderr(
|
|
"\
|
|
error: failed to parse manifest at `[..]`
|
|
|
|
Caused by:
|
|
replacements must specify a version to replace, but `[..]foo` does not
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn invalid_semver_version() {
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "*"
|
|
|
|
[replace]
|
|
"foo:*" = { git = 'https://example.com' }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(101).with_stderr_contains(
|
|
"\
|
|
error: failed to parse manifest at `[..]`
|
|
|
|
Caused by:
|
|
replacements must specify a valid semver version to replace, but `foo:*` does not
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn different_version() {
|
|
Package::new("foo", "0.2.0").publish();
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = "0.2.0"
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(101).with_stderr(
|
|
"\
|
|
error: failed to parse manifest at `[..]`
|
|
|
|
Caused by:
|
|
replacements cannot specify a version requirement, but found one for [..]
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn transitive() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
Package::new("bar", "0.2.0")
|
|
.dep("foo", "0.1.0")
|
|
.file("src/lib.rs", "extern crate foo; fn bar() { foo::foo(); }")
|
|
.publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = "0.2.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `file://[..]`
|
|
[UPDATING] git repository `[..]`
|
|
[DOWNLOADING] bar v0.2.0 (registry [..])
|
|
[COMPILING] foo v0.1.0 (file://[..])
|
|
[COMPILING] bar v0.2.0
|
|
[COMPILING] local v0.0.1 (file://[..])
|
|
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
|
|
",
|
|
),
|
|
);
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
|
|
}
|
|
|
|
#[test]
|
|
fn persists_across_rebuilds() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file(
|
|
"src/lib.rs",
|
|
"
|
|
extern crate foo;
|
|
pub fn bar() {
|
|
foo::foo();
|
|
}
|
|
",
|
|
)
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `file://[..]`
|
|
[UPDATING] git repository `file://[..]`
|
|
[COMPILING] foo v0.1.0 (file://[..])
|
|
[COMPILING] local v0.0.1 (file://[..])
|
|
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
|
|
",
|
|
),
|
|
);
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
|
|
}
|
|
|
|
#[test]
|
|
fn replace_registry_with_path() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let _ = project("foo")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = { path = "../foo" }
|
|
"#,
|
|
)
|
|
.file(
|
|
"src/lib.rs",
|
|
"
|
|
extern crate foo;
|
|
pub fn bar() {
|
|
foo::foo();
|
|
}
|
|
",
|
|
)
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `file://[..]`
|
|
[COMPILING] foo v0.1.0 (file://[..])
|
|
[COMPILING] local v0.0.1 (file://[..])
|
|
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn use_a_spec_to_select() {
|
|
Package::new("foo", "0.1.1")
|
|
.file("src/lib.rs", "pub fn foo1() {}")
|
|
.publish();
|
|
Package::new("foo", "0.2.0").publish();
|
|
Package::new("bar", "0.1.1")
|
|
.dep("foo", "0.2")
|
|
.file(
|
|
"src/lib.rs",
|
|
"
|
|
extern crate foo;
|
|
pub fn bar() { foo::foo3(); }
|
|
",
|
|
)
|
|
.publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.2.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo3() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = "0.1"
|
|
foo = "0.1"
|
|
|
|
[replace]
|
|
"foo:0.2.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file(
|
|
"src/lib.rs",
|
|
"
|
|
extern crate foo;
|
|
extern crate bar;
|
|
|
|
pub fn local() {
|
|
foo::foo1();
|
|
bar::bar();
|
|
}
|
|
",
|
|
)
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `file://[..]`
|
|
[UPDATING] git repository `[..]`
|
|
[DOWNLOADING] [..]
|
|
[DOWNLOADING] [..]
|
|
[COMPILING] [..]
|
|
[COMPILING] [..]
|
|
[COMPILING] [..]
|
|
[COMPILING] local v0.0.1 (file://[..])
|
|
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn override_adds_some_deps() {
|
|
Package::new("foo", "0.1.1").publish();
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1"
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = "0.1"
|
|
|
|
[replace]
|
|
"bar:0.1.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `file://[..]`
|
|
[UPDATING] git repository `[..]`
|
|
[DOWNLOADING] foo v0.1.1 (registry [..])
|
|
[COMPILING] foo v0.1.1
|
|
[COMPILING] bar v0.1.0 ([..])
|
|
[COMPILING] local v0.0.1 (file://[..])
|
|
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
|
|
",
|
|
),
|
|
);
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
|
|
|
|
Package::new("foo", "0.1.2").publish();
|
|
assert_that(
|
|
p.cargo("update")
|
|
.arg("-p")
|
|
.arg(&format!("{}#bar", foo.url())),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] git repository `file://[..]`
|
|
[UPDATING] registry `file://[..]`
|
|
",
|
|
),
|
|
);
|
|
assert_that(
|
|
p.cargo("update")
|
|
.arg("-p")
|
|
.arg("https://github.com/rust-lang/crates.io-index#bar"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `file://[..]`
|
|
",
|
|
),
|
|
);
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
|
|
}
|
|
|
|
#[test]
|
|
fn locked_means_locked_yes_no_seriously_i_mean_locked() {
|
|
// this in theory exercises #2041
|
|
Package::new("foo", "0.1.0").publish();
|
|
Package::new("foo", "0.2.0").publish();
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "*"
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1"
|
|
bar = "0.1"
|
|
|
|
[replace]
|
|
"bar:0.1.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0));
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
|
|
assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
|
|
}
|
|
|
|
#[test]
|
|
fn override_wrong_name() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(101).with_stderr(
|
|
"\
|
|
[UPDATING] registry [..]
|
|
[UPDATING] git repository [..]
|
|
error: no matching package for override `[..]foo:0.1.0` found
|
|
location searched: file://[..]
|
|
version required: = 0.1.0
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn override_with_nothing() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(101).with_stderr(
|
|
"\
|
|
[UPDATING] registry [..]
|
|
[UPDATING] git repository [..]
|
|
[ERROR] failed to load source for a dependency on `foo`
|
|
|
|
Caused by:
|
|
Unable to update file://[..]
|
|
|
|
Caused by:
|
|
Could not find Cargo.toml in `[..]`
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn override_wrong_version() {
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[replace]
|
|
"foo:0.1.0" = { git = 'https://example.com', version = '0.2.0' }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(101).with_stderr(
|
|
"\
|
|
error: failed to parse manifest at `[..]`
|
|
|
|
Caused by:
|
|
replacements cannot specify a version requirement, but found one for `[..]foo:0.1.0`
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn multiple_specs() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{0}' }}
|
|
|
|
[replace."https://github.com/rust-lang/crates.io-index#foo:0.1.0"]
|
|
git = '{0}'
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(101).with_stderr(
|
|
"\
|
|
[UPDATING] registry [..]
|
|
[UPDATING] git repository [..]
|
|
error: overlapping replacement specifications found:
|
|
|
|
* [..]
|
|
* [..]
|
|
|
|
both specifications match: foo v0.1.0
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_override_dep() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{0}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("test").arg("-p").arg("foo"),
|
|
execs().with_status(101).with_stderr_contains(
|
|
"\
|
|
error: There are multiple `foo` packages in your project, and the [..]
|
|
Please re-run this command with [..]
|
|
[..]#foo:0.1.0
|
|
[..]#foo:0.1.0
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn update() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{0}' }}
|
|
"#,
|
|
foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(p.cargo("generate-lockfile"), execs().with_status(0));
|
|
assert_that(
|
|
p.cargo("update"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] registry `[..]`
|
|
[UPDATING] git repository `[..]`
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
// local -> near -> far
|
|
// near is overridden with itself
|
|
#[test]
|
|
fn no_override_self() {
|
|
let deps = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"far/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "far"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("far/src/lib.rs", "")
|
|
.file(
|
|
"near/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "near"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
far = { path = "../far" }
|
|
"#,
|
|
)
|
|
.file(
|
|
"near/src/lib.rs",
|
|
r#"
|
|
#![no_std]
|
|
pub extern crate far;
|
|
"#,
|
|
)
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
near = {{ git = '{0}' }}
|
|
|
|
[replace]
|
|
"near:0.1.0" = {{ git = '{0}' }}
|
|
"#,
|
|
deps.url()
|
|
),
|
|
)
|
|
.file(
|
|
"src/lib.rs",
|
|
r#"
|
|
#![no_std]
|
|
pub extern crate near;
|
|
"#,
|
|
)
|
|
.build();
|
|
|
|
assert_that(p.cargo("build").arg("--verbose"), execs().with_status(0));
|
|
}
|
|
|
|
#[test]
|
|
fn broken_path_override_warns() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
Package::new("foo", "0.2.0").publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
a = { path = "a1" }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.file(
|
|
"a1/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "a"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1"
|
|
"#,
|
|
)
|
|
.file("a1/src/lib.rs", "")
|
|
.file(
|
|
"a2/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "a"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.2"
|
|
"#,
|
|
)
|
|
.file("a2/src/lib.rs", "")
|
|
.file(
|
|
".cargo/config",
|
|
r#"
|
|
paths = ["a2"]
|
|
"#,
|
|
)
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[UPDATING] [..]
|
|
warning: path override for crate `a` has altered the original list of
|
|
dependencies; the dependency on `foo` was either added or
|
|
modified to not match the previously resolved version
|
|
|
|
This is currently allowed but is known to produce buggy behavior with spurious
|
|
recompiles and changes to the crate graph. Path overrides unfortunately were
|
|
never intended to support this feature, so for now this message is just a
|
|
warning. In the future, however, this message will become a hard error.
|
|
|
|
To change the dependency graph via an override it's recommended to use the
|
|
`[replace]` feature of Cargo instead of the path override feature. This is
|
|
documented online at the url below for more information.
|
|
|
|
http://doc.crates.io/specifying-dependencies.html#overriding-dependencies
|
|
|
|
[DOWNLOADING] [..]
|
|
[COMPILING] [..]
|
|
[COMPILING] [..]
|
|
[COMPILING] [..]
|
|
[FINISHED] [..]
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn override_an_override() {
|
|
Package::new("chrono", "0.2.0")
|
|
.dep("serde", "< 0.9")
|
|
.publish();
|
|
Package::new("serde", "0.7.0")
|
|
.file("src/lib.rs", "pub fn serde07() {}")
|
|
.publish();
|
|
Package::new("serde", "0.8.0")
|
|
.file("src/lib.rs", "pub fn serde08() {}")
|
|
.publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
chrono = "0.2"
|
|
serde = "0.8"
|
|
|
|
[replace]
|
|
"chrono:0.2.0" = { path = "chrono" }
|
|
"serde:0.8.0" = { path = "serde" }
|
|
"#,
|
|
)
|
|
.file(
|
|
"Cargo.lock",
|
|
r#"
|
|
[[package]]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
dependencies = [
|
|
"chrono 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "chrono"
|
|
version = "0.2.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
replace = "chrono 0.2.0"
|
|
|
|
[[package]]
|
|
name = "chrono"
|
|
version = "0.2.0"
|
|
dependencies = [
|
|
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "serde"
|
|
version = "0.7.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "serde"
|
|
version = "0.8.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
replace = "serde 0.8.0"
|
|
|
|
[[package]]
|
|
name = "serde"
|
|
version = "0.8.0"
|
|
"#,
|
|
)
|
|
.file(
|
|
"src/lib.rs",
|
|
"
|
|
extern crate chrono;
|
|
extern crate serde;
|
|
|
|
pub fn local() {
|
|
chrono::chrono();
|
|
serde::serde08_override();
|
|
}
|
|
",
|
|
)
|
|
.file(
|
|
"chrono/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "chrono"
|
|
version = "0.2.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
serde = "< 0.9"
|
|
"#,
|
|
)
|
|
.file(
|
|
"chrono/src/lib.rs",
|
|
"
|
|
extern crate serde;
|
|
pub fn chrono() {
|
|
serde::serde07();
|
|
}
|
|
",
|
|
)
|
|
.file(
|
|
"serde/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "serde"
|
|
version = "0.8.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file(
|
|
"serde/src/lib.rs",
|
|
"
|
|
pub fn serde08_override() {}
|
|
",
|
|
)
|
|
.build();
|
|
|
|
assert_that(p.cargo("build").arg("-v"), execs().with_status(0));
|
|
}
|
|
|
|
#[test]
|
|
fn overriding_nonexistent_no_spurious() {
|
|
Package::new("foo", "0.1.0").dep("bar", "0.1").publish();
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let foo = git::repo(&paths::root().join("override"))
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { path = "bar" }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "pub fn foo() {}")
|
|
.file(
|
|
"bar/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("bar/src/lib.rs", "pub fn foo() {}")
|
|
.build();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
&format!(
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = {{ git = '{url}' }}
|
|
"bar:0.1.0" = {{ git = '{url}' }}
|
|
"#,
|
|
url = foo.url()
|
|
),
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0));
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs()
|
|
.with_status(0)
|
|
.with_stderr(
|
|
"\
|
|
[WARNING] package replacement is not used: [..]bar:0.1.0
|
|
[FINISHED] [..]
|
|
",
|
|
)
|
|
.with_stdout(""),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn no_warnings_when_replace_is_used_in_another_workspace_member() {
|
|
Package::new("foo", "0.1.0").publish();
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let p = project("ws")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[workspace]
|
|
members = [ "first_crate", "second_crate"]
|
|
|
|
[replace]
|
|
"foo:0.1.0" = { path = "local_foo" }"#,
|
|
)
|
|
.file(
|
|
"first_crate/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "first_crate"
|
|
version = "0.1.0"
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
"#,
|
|
)
|
|
.file("first_crate/src/lib.rs", "")
|
|
.file(
|
|
"second_crate/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "second_crate"
|
|
version = "0.1.0"
|
|
"#,
|
|
)
|
|
.file("second_crate/src/lib.rs", "")
|
|
.file(
|
|
"local_foo/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
"#,
|
|
)
|
|
.file("local_foo/src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build").cwd(p.root().join("first_crate")),
|
|
execs().with_status(0).with_stdout("").with_stderr(
|
|
"\
|
|
[UPDATING] registry `[..]`
|
|
[COMPILING] foo v0.1.0 ([..])
|
|
[COMPILING] first_crate v0.1.0 ([..])
|
|
[FINISHED] [..]",
|
|
),
|
|
);
|
|
|
|
assert_that(
|
|
p.cargo("build").cwd(p.root().join("second_crate")),
|
|
execs().with_status(0).with_stdout("").with_stderr(
|
|
"\
|
|
[COMPILING] second_crate v0.1.0 ([..])
|
|
[FINISHED] [..]",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn override_to_path_dep() {
|
|
Package::new("foo", "0.1.0").dep("bar", "0.1").publish();
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.file(
|
|
"foo/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { path = "bar" }
|
|
"#,
|
|
)
|
|
.file("foo/src/lib.rs", "")
|
|
.file(
|
|
"foo/bar/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.0.1"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("foo/bar/src/lib.rs", "")
|
|
.file(
|
|
".cargo/config",
|
|
r#"
|
|
paths = ["foo"]
|
|
"#,
|
|
)
|
|
.build();
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0));
|
|
}
|
|
|
|
#[test]
|
|
fn replace_to_path_dep() {
|
|
Package::new("foo", "0.1.0").dep("bar", "0.1").publish();
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = "0.1.0"
|
|
|
|
[replace]
|
|
"foo:0.1.0" = { path = "foo" }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "extern crate foo;")
|
|
.file(
|
|
"foo/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { path = "bar" }
|
|
"#,
|
|
)
|
|
.file(
|
|
"foo/src/lib.rs",
|
|
"
|
|
extern crate bar;
|
|
|
|
pub fn foo() {
|
|
bar::bar();
|
|
}
|
|
",
|
|
)
|
|
.file(
|
|
"foo/bar/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("foo/bar/src/lib.rs", "pub fn bar() {}")
|
|
.build();
|
|
|
|
assert_that(p.cargo("build"), execs().with_status(0));
|
|
}
|
|
|
|
#[test]
|
|
fn paths_ok_with_optional() {
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = { path = "foo" }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.file(
|
|
"foo/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { version = "0.1", optional = true }
|
|
"#,
|
|
)
|
|
.file("foo/src/lib.rs", "")
|
|
.file(
|
|
"foo2/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { version = "0.1", optional = true }
|
|
"#,
|
|
)
|
|
.file("foo2/src/lib.rs", "")
|
|
.file(
|
|
".cargo/config",
|
|
r#"
|
|
paths = ["foo2"]
|
|
"#,
|
|
)
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr(
|
|
"\
|
|
[COMPILING] foo v0.1.0 ([..]foo2)
|
|
[COMPILING] local v0.0.1 ([..])
|
|
[FINISHED] [..]
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn paths_add_optional_bad() {
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = { path = "foo" }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.file(
|
|
"foo/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
"#,
|
|
)
|
|
.file("foo/src/lib.rs", "")
|
|
.file(
|
|
"foo2/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { version = "0.1", optional = true }
|
|
"#,
|
|
)
|
|
.file("foo2/src/lib.rs", "")
|
|
.file(
|
|
".cargo/config",
|
|
r#"
|
|
paths = ["foo2"]
|
|
"#,
|
|
)
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs().with_status(0).with_stderr_contains(
|
|
"\
|
|
warning: path override for crate `foo` has altered the original list of
|
|
dependencies; the dependency on `bar` was either added or\
|
|
",
|
|
),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn override_with_default_feature() {
|
|
Package::new("another", "0.1.0").publish();
|
|
Package::new("another", "0.1.1").dep("bar", "0.1").publish();
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let p = project("local")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "local"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { path = "bar", default-features = false }
|
|
another = "0.1"
|
|
another2 = { path = "another2" }
|
|
|
|
[replace]
|
|
'bar:0.1.0' = { path = "bar" }
|
|
"#,
|
|
)
|
|
.file(
|
|
"src/main.rs",
|
|
r#"
|
|
extern crate bar;
|
|
|
|
fn main() {
|
|
bar::bar();
|
|
}
|
|
"#,
|
|
)
|
|
.file(
|
|
"bar/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[features]
|
|
default = []
|
|
"#,
|
|
)
|
|
.file(
|
|
"bar/src/lib.rs",
|
|
r#"
|
|
#[cfg(feature = "default")]
|
|
pub fn bar() {}
|
|
"#,
|
|
)
|
|
.file(
|
|
"another2/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "another2"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = { version = "0.1", default-features = false }
|
|
"#,
|
|
)
|
|
.file("another2/src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(p.cargo("run"), execs().with_status(0));
|
|
}
|
|
|
|
#[test]
|
|
fn override_plus_dep() {
|
|
Package::new("bar", "0.1.0").publish();
|
|
|
|
let p = project("foo")
|
|
.file(
|
|
"Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "foo"
|
|
version = "0.0.1"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
bar = "0.1"
|
|
|
|
[replace]
|
|
'bar:0.1.0' = { path = "bar" }
|
|
"#,
|
|
)
|
|
.file("src/lib.rs", "")
|
|
.file(
|
|
"bar/Cargo.toml",
|
|
r#"
|
|
[package]
|
|
name = "bar"
|
|
version = "0.1.0"
|
|
authors = []
|
|
|
|
[dependencies]
|
|
foo = { path = ".." }
|
|
"#,
|
|
)
|
|
.file("bar/src/lib.rs", "")
|
|
.build();
|
|
|
|
assert_that(
|
|
p.cargo("build"),
|
|
execs()
|
|
.with_status(101)
|
|
.with_stderr_contains("error: cyclic package dependency: [..]"),
|
|
);
|
|
}
|