Skip to content
Closed
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion debian-packaging/src/package_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,24 @@ fn lexical_compare(a: &str, b: &str) -> Ordering {
loop {
let ord = match (a_chars.next(), b_chars.next()) {
(Some('~'), Some('~')) => Ordering::Equal,

// tilde vs any character
(Some('~'), _) => Ordering::Less,
(_, Some('~')) => Ordering::Greater,

// any character vs end of string
(Some(_), None) => Ordering::Greater,
(None, Some('~')) => Ordering::Greater,
(None, Some(_)) => Ordering::Less,

// alphanumeric vs non-alphanumeric
(Some(a), Some(b)) if a.is_ascii_alphabetic() && !b.is_ascii_alphabetic() => {
Ordering::Less
}
(Some(a), Some(b)) if !a.is_ascii_alphabetic() && b.is_ascii_alphabetic() => {
Ordering::Greater
}

// fallback cases
(Some(a), Some(b)) => a.cmp(&b),
(None, None) => break,
};
Expand Down Expand Up @@ -400,6 +408,8 @@ mod test {
assert_eq!(lexical_compare("~", "~~a"), Ordering::Greater);
assert_eq!(lexical_compare("~", ""), Ordering::Less);
assert_eq!(lexical_compare("", "~"), Ordering::Greater);
assert_eq!(lexical_compare("~", "a"), Ordering::Less);
assert_eq!(lexical_compare("a", "~"), Ordering::Greater);
assert_eq!(lexical_compare("", "a"), Ordering::Less);
assert_eq!(lexical_compare("a", ""), Ordering::Greater);
assert_eq!(lexical_compare("a", "b"), Ordering::Less);
Expand Down
Loading