publish: Move dependency name validation to validate_dependencies() fn

Author: Turbo87

src/controllers/krate/publish.rs

@@ -472,6 +472,17 @@ pub fn validate_dependencies(deps: &[EncodableCrateDependency]) -> AppResult<()>
             }
             _ => {}
         }
+
+        if let Some(toml_name) = &dep.explicit_name_in_toml {
+            if !Crate::valid_dependency_name(toml_name) {
+                return Err(cargo_err(&format_args!(
+                    "\"{toml_name}\" is an invalid dependency name (dependency \
+                    names must start with a letter or underscore, contain only \
+                    letters, numbers, hyphens, or underscores and have at most \
+                    {MAX_NAME_LENGTH} characters)"
+                )));
+            }
+        }
     }
 
     Ok(())

src/tests/builders/dependency.rs

@@ -2,7 +2,7 @@ use crates_io::views::krate_publish as u;
 
 /// A builder for constructing a dependency of another crate.
 pub struct DependencyBuilder {
-    explicit_name_in_toml: Option<u::EncodableDependencyName>,
+    explicit_name_in_toml: Option<String>,
     name: String,
     features: Vec<String>,
     registry: Option<String>,
@@ -23,7 +23,7 @@ impl DependencyBuilder {
 
     /// Rename this dependency.
     pub fn rename(mut self, new_name: &str) -> Self {
-        self.explicit_name_in_toml = Some(u::EncodableDependencyName(new_name.to_string()));
+        self.explicit_name_in_toml = Some(new_name.to_string());
         self
     }
 

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

@@ -5,7 +5,7 @@ expression: response.into_json()
 {
   "errors": [
     {
-      "detail": "invalid upload request: invalid value: string \"💩\", expected a valid dependency name to start with a letter or underscore, contain only letters, numbers, hyphens, or underscores and have at most 64 characters at line 1 column 197"
+      "detail": "\"💩\" is an invalid dependency name (dependency names must start with a letter or underscore, contain only letters, numbers, hyphens, or underscores and have at most 64 characters)"
     }
   ]
 }

src/views/krate_publish.rs

@@ -28,7 +28,7 @@ pub struct EncodableCrateDependency {
     pub version_req: String,
     pub target: Option<String>,
     pub kind: Option<DependencyKind>,
-    pub explicit_name_in_toml: Option<EncodableDependencyName>,
+    pub explicit_name_in_toml: Option<String>,
     pub registry: Option<String>,
 }
 
@@ -51,25 +51,6 @@ impl<'de> Deserialize<'de> for EncodableCrateName {
     }
 }
 
-#[derive(Serialize, Clone, Debug, Deref)]
-pub struct EncodableDependencyName(pub String);
-
-impl<'de> Deserialize<'de> for EncodableDependencyName {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableDependencyName, D::Error> {
-        let s = String::deserialize(d)?;
-        if !Crate::valid_dependency_name(&s) {
-            let value = de::Unexpected::Str(&s);
-            let expected = format!(
-                "a valid dependency name to start with a letter or underscore, contain only letters, \
-                 numbers, hyphens, or underscores and have at most {MAX_NAME_LENGTH} characters"
-            );
-            Err(de::Error::invalid_value(value, &expected.as_ref()))
-        } else {
-            Ok(EncodableDependencyName(s))
-        }
-    }
-}
-
 #[derive(Serialize, Debug, Deref)]
 pub struct EncodableCrateVersion(pub semver::Version);