views/krate_publish: Reorder file contents (#7207)

Having the `impl` blocks so far away from the structs was very confusing. This change ensures that it is harder to miss them.

Author: Turbo87

src/views/krate_publish.rs

@@ -4,6 +4,9 @@
 //! integration tests.
 use std::collections::BTreeMap;
 
+use diesel::pg::Pg;
+use diesel::serialize::{self, Output, ToSql};
+use diesel::sql_types::Text;
 use serde::{de, Deserialize, Deserializer, Serialize};
 
 use crate::models::krate::MAX_NAME_LENGTH;
@@ -26,25 +29,6 @@ pub struct PublishMetadata {
     pub categories: EncodableCategoryList,
 }
 
-#[derive(PartialEq, Eq, Hash, Serialize, Clone, Debug, Deref)]
-pub struct EncodableCrateName(pub String);
-#[derive(Serialize, Clone, Debug, Deref)]
-pub struct EncodableDependencyName(pub String);
-#[derive(Serialize, Debug, Deref)]
-pub struct EncodableCrateVersion(pub semver::Version);
-#[derive(Serialize, Clone, Debug, Deref)]
-pub struct EncodableCrateVersionReq(pub String);
-#[derive(Serialize, Debug, Deref, Default)]
-pub struct EncodableKeywordList(pub Vec<EncodableKeyword>);
-#[derive(Serialize, Debug, Deref)]
-pub struct EncodableKeyword(pub String);
-#[derive(Serialize, Debug, Deref, Default)]
-pub struct EncodableCategoryList(pub Vec<String>);
-#[derive(Serialize, Clone, Debug, Deref)]
-pub struct EncodableFeature(pub String);
-#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Clone, Debug, Deref)]
-pub struct EncodableFeatureName(pub String);
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct EncodableCrateDependency {
     pub optional: bool,
@@ -58,6 +42,9 @@ pub struct EncodableCrateDependency {
     pub registry: Option<String>,
 }
 
+#[derive(PartialEq, Eq, Hash, Serialize, Clone, Debug, Deref)]
+pub struct EncodableCrateName(pub String);
+
 impl<'de> Deserialize<'de> for EncodableCrateName {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableCrateName, D::Error> {
         let s = String::deserialize(d)?;
@@ -83,6 +70,9 @@ where
     }
 }
 
+#[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)?;
@@ -99,6 +89,9 @@ impl<'de> Deserialize<'de> for EncodableDependencyName {
     }
 }
 
+#[derive(Serialize, Debug, Deref)]
+pub struct EncodableKeyword(pub String);
+
 impl<'de> Deserialize<'de> for EncodableKeyword {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableKeyword, D::Error> {
         let s = String::deserialize(d)?;
@@ -115,6 +108,9 @@ impl<'de> Deserialize<'de> for EncodableKeyword {
     }
 }
 
+#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Clone, Debug, Deref)]
+pub struct EncodableFeatureName(pub String);
+
 impl<'de> Deserialize<'de> for EncodableFeatureName {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
         let s = String::deserialize(d)?;
@@ -129,6 +125,9 @@ impl<'de> Deserialize<'de> for EncodableFeatureName {
     }
 }
 
+#[derive(Serialize, Clone, Debug, Deref)]
+pub struct EncodableFeature(pub String);
+
 impl<'de> Deserialize<'de> for EncodableFeature {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableFeature, D::Error> {
         let s = String::deserialize(d)?;
@@ -142,6 +141,15 @@ impl<'de> Deserialize<'de> for EncodableFeature {
     }
 }
 
+impl ToSql<Text, Pg> for EncodableFeature {
+    fn to_sql(&self, out: &mut Output<'_, '_, Pg>) -> serialize::Result {
+        ToSql::<Text, Pg>::to_sql(&**self, &mut out.reborrow())
+    }
+}
+
+#[derive(Serialize, Debug, Deref)]
+pub struct EncodableCrateVersion(pub semver::Version);
+
 impl<'de> Deserialize<'de> for EncodableCrateVersion {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableCrateVersion, D::Error> {
         let s = String::deserialize(d)?;
@@ -156,6 +164,9 @@ 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)?;
@@ -170,6 +181,9 @@ impl<'de> Deserialize<'de> for EncodableCrateVersionReq {
     }
 }
 
+#[derive(Serialize, Debug, Deref, Default)]
+pub struct EncodableKeywordList(pub Vec<EncodableKeyword>);
+
 impl<'de> Deserialize<'de> for EncodableKeywordList {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableKeywordList, D::Error> {
         let inner = <Vec<EncodableKeyword> as Deserialize<'de>>::deserialize(d)?;
@@ -181,6 +195,9 @@ impl<'de> Deserialize<'de> for EncodableKeywordList {
     }
 }
 
+#[derive(Serialize, Debug, Deref, Default)]
+pub struct EncodableCategoryList(pub Vec<String>);
+
 impl<'de> Deserialize<'de> for EncodableCategoryList {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableCategoryList, D::Error> {
         let inner = <Vec<String> as Deserialize<'de>>::deserialize(d)?;
@@ -193,16 +210,6 @@ impl<'de> Deserialize<'de> for EncodableCategoryList {
     }
 }
 
-use diesel::pg::Pg;
-use diesel::serialize::{self, Output, ToSql};
-use diesel::sql_types::Text;
-
-impl ToSql<Text, Pg> for EncodableFeature {
-    fn to_sql(&self, out: &mut Output<'_, '_, Pg>) -> serialize::Result {
-        ToSql::<Text, Pg>::to_sql(&**self, &mut out.reborrow())
-    }
-}
-
 #[test]
 fn feature_deserializes_for_valid_features() {
     use serde_json as json;