Skip to content

remove whitespace from Display impl of VersionReq #196

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

Merged
merged 2 commits into from
Mar 15, 2020
Merged

remove whitespace from Display impl of VersionReq #196

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
cd288fc
remove whitespace from Display impl of VersionReq
dr-bonez Dec 27, 2019
ec88be0
fix tests
dr-bonez Jan 1, 2020
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/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
//! let r = VersionReq::parse(">= 1.0.0")?;
//! let v = Version::parse("1.0.0")?;
//!
//! assert!(r.to_string() == ">= 1.0.0".to_string());
//! assert!(r.to_string() == ">=1.0.0".to_string());
//! assert!(r.matches(&v));
//! # Ok(())
//! # }
Expand Down
32 changes: 16 additions & 16 deletions src/version_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,11 @@ impl fmt::Display for Predicate {
impl fmt::Display for Op {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match *self {
Ex => write!(fmt, "= ")?,
Gt => write!(fmt, "> ")?,
GtEq => write!(fmt, ">= ")?,
Lt => write!(fmt, "< ")?,
LtEq => write!(fmt, "<= ")?,
Ex => write!(fmt, "=")?,
Gt => write!(fmt, ">")?,
GtEq => write!(fmt, ">=")?,
Lt => write!(fmt, "<")?,
LtEq => write!(fmt, "<=")?,
Tilde => write!(fmt, "~")?,
Compatible => write!(fmt, "^")?,
// gets handled specially in Predicate::fmt
Expand Down Expand Up @@ -645,22 +645,22 @@ mod test {
fn test_parsing_exact() {
let r = req("=1.0.0");

assert!(r.to_string() == "= 1.0.0".to_string());
assert_eq!(r.to_string(), "= 1.0.0".to_string());
assert!(r.to_string() == "=1.0.0".to_string());
assert_eq!(r.to_string(), "=1.0.0".to_string());

assert_match(&r, &["1.0.0"]);
assert_not_match(&r, &["1.0.1", "0.9.9", "0.10.0", "0.1.0", "1.0.0-pre"]);

let r = req("=0.9.0");

assert_eq!(r.to_string(), "= 0.9.0".to_string());
assert_eq!(r.to_string(), "=0.9.0".to_string());

assert_match(&r, &["0.9.0"]);
assert_not_match(&r, &["0.9.1", "1.9.0", "0.0.9"]);

let r = req("=0.1.0-beta2.a");

assert_eq!(r.to_string(), "= 0.1.0-beta2.a".to_string());
assert_eq!(r.to_string(), "=0.1.0-beta2.a".to_string());

assert_match(&r, &["0.1.0-beta2.a"]);
assert_not_match(&r, &["0.9.1", "0.1.0", "0.1.1-beta2.a", "0.1.0-beta2"]);
Expand All @@ -685,7 +685,7 @@ mod test {
pub fn test_parsing_greater_than() {
let r = req(">= 1.0.0");

assert_eq!(r.to_string(), ">= 1.0.0".to_string());
assert_eq!(r.to_string(), ">=1.0.0".to_string());

assert_match(&r, &["1.0.0", "2.0.0"]);
assert_not_match(&r, &["0.1.0", "0.0.1", "1.0.0-pre", "2.0.0-pre"]);
Expand All @@ -703,7 +703,7 @@ mod test {
pub fn test_parsing_less_than() {
let r = req("< 1.0.0");

assert_eq!(r.to_string(), "< 1.0.0".to_string());
assert_eq!(r.to_string(), "<1.0.0".to_string());

assert_match(&r, &["0.1.0", "0.0.1"]);
assert_not_match(&r, &["1.0.0", "1.0.0-beta", "1.0.1", "0.9.9-alpha"]);
Expand All @@ -720,7 +720,7 @@ mod test {
#[test]
pub fn test_multiple() {
let r = req("> 0.0.9, <= 2.5.3");
assert_eq!(r.to_string(), "> 0.0.9, <= 2.5.3".to_string());
assert_eq!(r.to_string(), ">0.0.9, <=2.5.3".to_string());
assert_match(&r, &["0.0.10", "1.0.0", "2.5.3"]);
assert_not_match(&r, &["0.0.8", "2.5.4"]);

Expand All @@ -729,7 +729,7 @@ mod test {
assert_not_match(&r, &["0.0.8", "0.3.0", "0.4.0"]);

let r = req("<= 0.2.0, >= 0.5.0");
assert_eq!(r.to_string(), "<= 0.2.0, >= 0.5.0".to_string());
assert_eq!(r.to_string(), "<=0.2.0, >=0.5.0".to_string());
assert_not_match(&r, &["0.0.8", "0.3.0", "0.5.1"]);

let r = req("0.1.0, 0.1.4, 0.1.6");
Expand All @@ -741,7 +741,7 @@ mod test {
assert!(VersionReq::parse("> 0.3.0, ,").is_err());

let r = req(">=0.5.1-alpha3, <0.6");
assert_eq!(r.to_string(), ">= 0.5.1-alpha3, < 0.6".to_string());
assert_eq!(r.to_string(), ">=0.5.1-alpha3, <0.6".to_string());
assert_match(
&r,
&[
Expand Down Expand Up @@ -917,7 +917,7 @@ mod test {
);
assert_eq!(
"=1.0.0".parse::<VersionReq>().unwrap().to_string(),
"= 1.0.0".to_string()
"=1.0.0".to_string()
);
assert_eq!(
"~1".parse::<VersionReq>().unwrap().to_string(),
Expand Down Expand Up @@ -945,7 +945,7 @@ mod test {
);
assert_eq!(
"< 1.0.0".parse::<VersionReq>().unwrap().to_string(),
"< 1.0.0".to_string()
"<1.0.0".to_string()
);
}

Expand Down