From 58ffaeff00b520f42874344ab764756acd82365b Mon Sep 17 00:00:00 2001 From: Rohit Goswami Date: Sun, 15 Nov 2026 23:49:30 +0000 Subject: [PATCH] fix(version): exclude the next series pre-release from range operators --- .../+requirement-series-ceiling.bugfix.md | 1 + src/version.rs | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 changelog.d/+requirement-series-ceiling.bugfix.md diff --git a/changelog.d/+requirement-series-ceiling.bugfix.md b/changelog.d/+requirement-series-ceiling.bugfix.md new file mode 100644 index 00000000..c1f3e7c4 --- /dev/null +++ b/changelog.d/+requirement-series-ceiling.bugfix.md @@ -0,0 +1 @@ +Compatible-release, caret, and tilde requirements exclude a pre-release of the next series. `1.3.0rc1` is outside `~=1.2.0` and `~1.2.3`, and `2.0.0rc1` is outside `^1.2.0`. diff --git a/src/version.rs b/src/version.rs index 3540b77b..84152f18 100644 --- a/src/version.rs +++ b/src/version.rs @@ -412,7 +412,7 @@ fn matches_compatible_release(version: &str, floor: &str) -> bool { return true; } let ceiling = series_ceiling(&components, components.len() - 2); - cmp_version(version, &ceiling) == Ordering::Less + below_series_ceiling(version, &ceiling) } /// `^X.Y.Z` allows anything up to the next change of the left-most non-zero @@ -430,7 +430,7 @@ fn matches_caret(version: &str, floor: &str) -> bool { .position(|component| *component != 0) .unwrap_or(components.len() - 1); let ceiling = series_ceiling(&components, significant); - cmp_version(version, &ceiling) == Ordering::Less + below_series_ceiling(version, &ceiling) } /// `~X.Y.Z` and `~X.Y` allow patch-level changes, `~X` minor-level ones. @@ -444,7 +444,7 @@ fn matches_tilde(version: &str, floor: &str) -> bool { } let index = if components.len() >= 2 { 1 } else { 0 }; let ceiling = series_ceiling(&components, index); - cmp_version(version, &ceiling) == Ordering::Less + below_series_ceiling(version, &ceiling) } #[cfg(test)] @@ -494,6 +494,20 @@ mod ecosystem_operator_tests { assert!(matches_req("1.2.3rc1", "^1.2.0")); assert!(matches_req("1.2.3", "~=1.2.0")); } + + #[test] + fn a_prerelease_of_the_next_series_is_outside_the_bound() { + // `cmp_version` orders `1.3.0rc1` before `1.3`. A series ceiling of + // `1.3` still excludes that pre-release: it is the next series, not + // a member of `1.2`. + assert!(!matches_req("1.3.0rc1", "~=1.2.0")); + assert!(!matches_req("2.0.0rc1", "^1.2.0")); + assert!(!matches_req("1.3.0rc1", "~1.2.3")); + assert!(matches_req("1.3.0rc1", "^1.2.0")); + assert!(matches_req("1.2.9rc1", "~=1.2.0")); + assert!(matches_req("1.2.9rc1", "^1.2.0")); + assert!(matches_req("1.2.9rc1", "~1.2.3")); + } } #[cfg(test)]