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

Validate dependency version on parse, not usage

This commit is contained in:
Yehuda Katz + Carl Lerche 2014-06-10 14:29:36 -07:00 committed by Tim Carey-Smith
parent 1124727c96
commit 184cbda170
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cargo/core/manifest.rs
View File

@ -197,7 +197,13 @@ pub struct Project {
#[deriving(Encodable,PartialEq,Clone,Show)]
pub enum TomlDependency {
SimpleDep(String),
DetailedDep(HashMap<String, String>)
DetailedDep(DetailedTomlDependency)
}
#[deriving(Encodable,PartialEq,Clone,Show)]
pub struct DetailedTomlDependency {
version: String,
other: HashMap<String, String>
}
#[deriving(Encodable,PartialEq,Clone)]
@ -243,7 +249,13 @@ impl TomlManifest {
details.insert(k.clone(), v.clone());
}
deps.insert(k.clone(), DetailedDep(details));
let version = try!(details.find_equiv(&"version")
.require(simple_human("dependencies must include a version"))).clone();
deps.insert(k.clone(), DetailedDep(DetailedTomlDependency {
version: version,
other: details
}));
},
_ => ()
}
@ -275,9 +287,8 @@ impl TomlManifest {
Some(ref dependencies) => {
for (n, v) in dependencies.iter() {
let version = match *v {
SimpleDep(ref string) => string,
DetailedDep(ref map) => try!(map.find_equiv(&"version")
.require(simple_human("dependencies must include a version")))
SimpleDep(ref string) => string.clone(),
DetailedDep(ref details) => details.version.clone()
};
deps.push(try!(Dependency::parse(n.as_slice(), version.as_slice())))