development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-25 02:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #2940 - matklad:ambiguous-deps, r=alexcrichton

Browse source 
Warn about unused keys in dependency specification

Closes #2869 and #2695
This commit is contained in:
bors 2016-08-01 08:51:40 -07:00 committed by GitHub
parent 1ceb0c9461 5010618157
commit 3417598163
2 changed files with 105 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/cargo/util/toml.rs
View file

@ -775,8 +775,44 @@ impl TomlDependency {
cx.warnings.push(msg);
}
if details.git.is_none() {
let git_only_keys = [
(&details.branch, "branch"),
(&details.tag, "tag"),
(&details.rev, "rev")
];
for &(key, key_name) in git_only_keys.iter() {
if key.is_some() {
let msg = format!("key `{}` is ignored for dependency ({}). \
This will be considered an error in future versions",
key_name, name);
cx.warnings.push(msg)
}
}
}
let new_source_id = match (details.git.as_ref(), details.path.as_ref()) {
(Some(git), _) => {
(Some(git), maybe_path) => {
if maybe_path.is_some() {
let msg = format!("dependency ({}) specification is ambiguous. \
Only one of `git` or `path` is allowed. \
This will be considered an error in future versions", name);
cx.warnings.push(msg)
}
let n_details = [&details.branch, &details.tag, &details.rev]
.iter()
.filter(|d| d.is_some())
.count();
if n_details > 1 {
let msg = format!("dependency ({}) specification is ambiguous. \
Only one of `branch`, `tag` or `rev` is allowed. \
This will be considered an error in future versions", name);
cx.warnings.push(msg)
}
let reference = details.branch.clone().map(GitReference::Branch)
.or_else(|| details.tag.clone().map(GitReference::Tag))
.or_else(|| details.rev.clone().map(GitReference::Rev))

68
tests/bad-config.rs
View file

@ -513,3 +513,71 @@ in the future.
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
"));
}
#[test]
fn ambiguous_git_reference() {
let foo = project("foo")
.file("Cargo.toml", r#"
[package]
name = "foo"
version = "0.0.0"
authors = []
[dependencies.bar]
git = "https://example.com"
branch = "master"
tag = "some-tag"
"#)
.file("src/lib.rs", "");
assert_that(foo.cargo_process("build").arg("-v"),
execs().with_stderr_contains("\
[WARNING] dependency (bar) specification is ambiguous. \
Only one of `branch`, `tag` or `rev` is allowed. \
This will be considered an error in future versions
"));
}
#[test]
fn both_git_and_path_specified() {
let foo = project("foo")
.file("Cargo.toml", r#"
[package]
name = "foo"
version = "0.0.0"
authors = []
[dependencies.bar]
git = "https://example.com"
path = "bar"
"#)
.file("src/lib.rs", "");
assert_that(foo.cargo_process("build").arg("-v"),
execs().with_stderr_contains("\
[WARNING] dependency (bar) specification is ambiguous. \
Only one of `git` or `path` is allowed. \
This will be considered an error in future versions
"));
}
#[test]
fn ignored_git_revision() {
let foo = project("foo")
.file("Cargo.toml", r#"
[package]
name = "foo"
version = "0.0.0"
authors = []
[dependencies.bar]
path = "bar"
branch = "spam"
"#)
.file("src/lib.rs", "");
assert_that(foo.cargo_process("build").arg("-v"),
execs().with_stderr_contains("\
[WARNING] key `branch` is ignored for dependency (bar). \
This will be considered an error in future versions"));
}