use Self in impl From<&Self> for type (#727)

oxidecomputer · Dec 26, 2024 · 3b7df1e · 3b7df1e
1 parent fa65d74
commit 3b7df1e
Show file tree

Hide file tree

Showing 23 changed files with 2,027 additions and 3,074 deletions.
diff --git a/cargo-typify/tests/outputs/builder.rs b/cargo-typify/tests/outputs/builder.rs
@@ -105,7 +105,7 @@ pub enum FruitOrVeg {
     Veg(Veggie),
     Fruit(Fruit),
 }
-impl ::std::convert::From<&FruitOrVeg> for FruitOrVeg {
+impl ::std::convert::From<&Self> for FruitOrVeg {
     fn from(value: &FruitOrVeg) -> Self {
         value.clone()
     }

diff --git a/cargo-typify/tests/outputs/custom_btree_map.rs b/cargo-typify/tests/outputs/custom_btree_map.rs
@@ -106,7 +106,7 @@ pub enum FruitOrVeg {
     Veg(Veggie),
     Fruit(Fruit),
 }
-impl ::std::convert::From<&FruitOrVeg> for FruitOrVeg {
+impl ::std::convert::From<&Self> for FruitOrVeg {
     fn from(value: &FruitOrVeg) -> Self {
         value.clone()
     }

diff --git a/cargo-typify/tests/outputs/derive.rs b/cargo-typify/tests/outputs/derive.rs
@@ -105,7 +105,7 @@ pub enum FruitOrVeg {
     Veg(Veggie),
     Fruit(Fruit),
 }
-impl ::std::convert::From<&FruitOrVeg> for FruitOrVeg {
+impl ::std::convert::From<&Self> for FruitOrVeg {
     fn from(value: &FruitOrVeg) -> Self {
         value.clone()
     }

diff --git a/cargo-typify/tests/outputs/multi_derive.rs b/cargo-typify/tests/outputs/multi_derive.rs
@@ -109,7 +109,7 @@ pub enum FruitOrVeg {
     Veg(Veggie),
     Fruit(Fruit),
 }
-impl ::std::convert::From<&FruitOrVeg> for FruitOrVeg {
+impl ::std::convert::From<&Self> for FruitOrVeg {
     fn from(value: &FruitOrVeg) -> Self {
         value.clone()
     }

diff --git a/cargo-typify/tests/outputs/no-builder.rs b/cargo-typify/tests/outputs/no-builder.rs
@@ -105,7 +105,7 @@ pub enum FruitOrVeg {
     Veg(Veggie),
     Fruit(Fruit),
 }
-impl ::std::convert::From<&FruitOrVeg> for FruitOrVeg {
+impl ::std::convert::From<&Self> for FruitOrVeg {
     fn from(value: &FruitOrVeg) -> Self {
         value.clone()
     }

diff --git a/typify-impl/src/conversions.rs b/typify-impl/src/conversions.rs
@@ -30,9 +30,8 @@ impl SchemaCache {
         };
         self.schemas
             .iter()
-            .filter_map(|(schema, type_entry)| {
-                (&search_schema == schema).then(|| type_entry.clone())
-            })
+            .filter(|(schema, _)| &search_schema == schema)
+            .map(|(_, type_entry)| type_entry.clone())
             .next()
     }
 }
diff --git a/typify-impl/src/enums.rs b/typify-impl/src/enums.rs
@@ -1473,7 +1473,7 @@ mod tests {
                 Err(::std::string::String),
             }
 
-            impl ::std::convert::From<&ResultX> for ResultX {
+            impl ::std::convert::From<&Self> for ResultX {
                 fn from(value: &ResultX) -> Self {
                     value.clone()
                 }
@@ -1525,7 +1525,7 @@ mod tests {
                 Err(::std::string::String),
             }
 
-            impl ::std::convert::From<&ResultX> for ResultX {
+            impl ::std::convert::From<&Self> for ResultX {
                 fn from(value: &ResultX) -> Self {
                     value.clone()
                 }

diff --git a/typify-impl/src/merge.rs b/typify-impl/src/merge.rs
@@ -613,7 +613,7 @@ fn merge_so_instance_type(
 ) -> Result<Option<SingleOrVec<InstanceType>>, ()> {
     match (a, b) {
         (None, None) => Ok(None),
-        (None, other @ Some(_)) | (other @ Some(_), None) => Ok(other.map(Clone::clone)),
+        (None, other @ Some(_)) | (other @ Some(_), None) => Ok(other.cloned()),
 
         // If each has a single type, it must match.
         (Some(SingleOrVec::Single(aa)), Some(SingleOrVec::Single(bb))) => {

diff --git a/typify-impl/src/structs.rs b/typify-impl/src/structs.rs
@@ -30,10 +30,7 @@ impl TypeSpace {
         // Gather up the properties that are required but for which we have no
         // schema. In those cases any value will do.
         let required_unspecified = validation.required.iter().filter_map(|prop_name| {
-            validation
-                .properties
-                .get(prop_name)
-                .is_none()
+            (!validation.properties.contains_key(prop_name))
                 .then_some((prop_name, &Schema::Bool(true)))
         });
 

diff --git a/typify-impl/src/type_entry.rs b/typify-impl/src/type_entry.rs
@@ -990,7 +990,7 @@ impl TypeEntry {
                 #(#variants_decl)*
             }
 
-            impl ::std::convert::From<&#type_name> for #type_name {
+            impl ::std::convert::From<&Self> for #type_name {
                 fn from(value: &#type_name) -> Self {
                     value.clone()
                 }

diff --git a/typify-impl/src/value.rs b/typify-impl/src/value.rs
@@ -412,7 +412,7 @@ fn value_for_struct_props(
     let extra_value = serde_json::Value::Object(
         map.clone()
             .into_iter()
-            .filter(|(name, _)| prop_map.get(name).is_none())
+            .filter(|(name, _)| !prop_map.contains_key(name))
             .collect(),
     );
 

diff --git a/typify-impl/tests/generator.out b/typify-impl/tests/generator.out
@@ -188,7 +188,7 @@ mod types {
         Two,
         BuckleMyShoe,
     }
-    impl ::std::convert::From<&StringEnum> for StringEnum {
+    impl ::std::convert::From<&Self> for StringEnum {
         fn from(value: &StringEnum) -> Self {
             value.clone()
         }