publish: Move version req validation to validate_dependencies() fn

Author: Turbo87

src/controllers/krate/publish.rs

@@ -457,13 +457,20 @@ pub fn validate_dependencies(deps: &[EncodableCrateDependency]) -> AppResult<()>
             }
         }
 
-        if let Ok(version_req) = semver::VersionReq::parse(&dep.version_req.0) {
-            if version_req == semver::VersionReq::STAR {
+        match semver::VersionReq::parse(&dep.version_req) {
+            Err(_) => {
+                return Err(cargo_err(&format_args!(
+                    "\"{}\" is an invalid version requirement",
+                    dep.version_req
+                )));
+            }
+            Ok(req) if req == semver::VersionReq::STAR => {
                 return Err(cargo_err(&format_args!("wildcard (`*`) dependency constraints are not allowed \
                     on crates.io. Crate with this problem: `{}` See https://doc.rust-lang.org/cargo/faq.html#can-\
                     libraries-use--as-a-version-for-their-dependencies for more \
                     information", dep.name)));
             }
+            _ => {}
         }
     }
 

src/tests/builders/dependency.rs

@@ -6,7 +6,7 @@ pub struct DependencyBuilder {
     name: String,
     features: Vec<String>,
     registry: Option<String>,
-    version_req: u::EncodableCrateVersionReq,
+    version_req: String,
 }
 
 impl DependencyBuilder {
@@ -17,7 +17,7 @@ impl DependencyBuilder {
             name: name.to_string(),
             features: vec![],
             registry: None,
-            version_req: u::EncodableCrateVersionReq("> 0".to_string()),
+            version_req: "> 0".to_string(),
         }
     }
 
@@ -40,7 +40,7 @@ impl DependencyBuilder {
     /// Panics if the `version_req` string specified isn't a valid `semver::VersionReq`.
     #[track_caller]
     pub fn version_req(mut self, version_req: &str) -> Self {
-        self.version_req = u::EncodableCrateVersionReq(version_req.to_string());
+        self.version_req = version_req.to_string();
         self
     }
 

src/tests/krate/publish/snapshots/all__krate__publish__dependencies__new_krate_with_broken_dependency_requirement.snap

@@ -5,7 +5,7 @@ expression: response.into_json()
 {
   "errors": [
     {
-      "detail": "invalid upload request: invalid value: string \"broken\", expected a valid version req at line 1 column 136"
+      "detail": "\"broken\" is an invalid version requirement"
     }
   ]
 }

src/views/krate_publish.rs

@@ -25,7 +25,7 @@ pub struct EncodableCrateDependency {
     pub default_features: bool,
     pub name: String,
     pub features: Vec<String>,
-    pub version_req: EncodableCrateVersionReq,
+    pub version_req: String,
     pub target: Option<String>,
     pub kind: Option<DependencyKind>,
     pub explicit_name_in_toml: Option<EncodableDependencyName>,
@@ -86,20 +86,3 @@ impl<'de> Deserialize<'de> for EncodableCrateVersion {
         }
     }
 }
-
-#[derive(Serialize, Clone, Debug, Deref)]
-pub struct EncodableCrateVersionReq(pub String);
-
-impl<'de> Deserialize<'de> for EncodableCrateVersionReq {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableCrateVersionReq, D::Error> {
-        let s = String::deserialize(d)?;
-        match semver::VersionReq::parse(&s) {
-            Ok(_) => Ok(EncodableCrateVersionReq(s)),
-            Err(..) => {
-                let value = de::Unexpected::Str(&s);
-                let expected = "a valid version req";
-                Err(de::Error::invalid_value(value, &expected))
-            }
-        }
-    }
-}