fix(spec): Require opt-in for pre-release

rust-lang · Oct 17, 2023 · d318ed4 · d318ed4
1 parent 0ec3274
commit d318ed4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs
@@ -470,9 +470,9 @@ mod tests {
 
         let pre = PackageId::new("pre", "1.2.3-alpha.0", sid).unwrap();
         assert!(PackageIdSpec::parse("pre").unwrap().matches(pre));
-        assert!(PackageIdSpec::parse("pre@1").unwrap().matches(pre));
-        assert!(PackageIdSpec::parse("pre@1.2").unwrap().matches(pre));
-        assert!(PackageIdSpec::parse("pre@1.2.3").unwrap().matches(pre));
+        assert!(!PackageIdSpec::parse("pre@1").unwrap().matches(pre));
+        assert!(!PackageIdSpec::parse("pre@1.2").unwrap().matches(pre));
+        assert!(!PackageIdSpec::parse("pre@1.2.3").unwrap().matches(pre));
         assert!(PackageIdSpec::parse("pre@1.2.3-alpha.0")
             .unwrap()
             .matches(pre));

diff --git a/src/cargo/util/semver_ext.rs b/src/cargo/util/semver_ext.rs
@@ -187,6 +187,11 @@ impl PartialVersion {
     /// Build metadata does not affect version precedence but may be necessary for uniquely
     /// identifying a package.
     pub fn matches(&self, version: &Version) -> bool {
+        if !version.pre.is_empty() && self.pre.is_none() {
+            // Pre-release versions must be explicitly opted into, if for no other reason than to
+            // give us room to figure out and define the semantics
+            return false;
+        }
         self.major == version.major
             && self.minor.map(|f| f == version.minor).unwrap_or(true)
             && self.patch.map(|f| f == version.patch).unwrap_or(true)