From: Steve Klabnik Date: Mon, 3 Oct 2016 20:55:24 +0000 (-0400) Subject: Print the warning X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~45^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a29c60a1cfdd0c22dee11591e027ae1969f791bd;p=cargo.git Print the warning --- diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs index 61167a8b4..bd909b309 100644 --- a/src/cargo/core/dependency.rs +++ b/src/cargo/core/dependency.rs @@ -91,9 +91,9 @@ impl DependencyInner { pub fn parse(name: &str, version: Option<&str>, source_id: &SourceId, - _config: &Config) -> CargoResult { + config: &Config) -> CargoResult { let (specified_req, version_req) = match version { - Some(v) => (true, try!(DependencyInner::parse_with_deprecated(v))), + Some(v) => (true, try!(DependencyInner::parse_with_deprecated(v, config))), None => (false, VersionReq::any()) }; @@ -105,16 +105,19 @@ impl DependencyInner { }) } - fn parse_with_deprecated(req: &str) -> Result { + fn parse_with_deprecated(req: &str, config: &Config) -> CargoResult { match VersionReq::parse(req) { Err(e) => { match e { ReqParseError::DeprecatedVersionRequirement(requirement) => { - // warn here + let msg = format!("One of your version requirements ({}) is invalid. \ +Previous versions of Cargo accepted this malformed requirement, but it is being deprecated. Please \ +use {} instead.", req, requirement); + try!(config.shell().warn(&msg)); Ok(requirement) } - e => Err(e), + e => Err(From::from(e)), } }, Ok(v) => Ok(v),