fmt changes

stratum-mining · Jan 14, 2025 · ae2807d · ae2807d
1 parent 7338c02
commit ae2807d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/utils/sv2_serde_json/examples/derive_macro_example.rs b/utils/sv2_serde_json/examples/derive_macro_example.rs
@@ -15,7 +15,7 @@ struct Person {
 #[derive(SerJson, DeJson, Debug)]
 struct Person2 {
     person: Person,
-    optional_struct: Option<Person>
+    optional_struct: Option<Person>,
 }
 
 #[derive(SerJson, DeJson, Debug)]
@@ -34,12 +34,12 @@ fn main() {
         here: vec!["HEre".to_string()],
         check: sv2_serde_json::value::Value::Null,
         optional_check: Some(sv2_serde_json::value::Value::Null),
-        non_optional_check: Some("Hello".to_string())
+        non_optional_check: Some("Hello".to_string()),
     };
 
     let person2 = Person2 {
         person: person.clone(),
-        optional_struct: Some(person.clone())
+        optional_struct: Some(person.clone()),
     };
 
     let person_json = person.to_json_value();

diff --git a/utils/sv2_serde_json/src/value.rs b/utils/sv2_serde_json/src/value.rs
@@ -15,7 +15,7 @@
 //     Object(HashMap<String, Value>),
 //     Null,
 //     None,                  // Represents Option::None
-//     Some(Box<Value>), 
+//     Some(Box<Value>),
 // }
 
 // impl Value {
@@ -238,7 +238,6 @@
 //     }
 // }
 
-
 // impl TryFrom<&Value> for Value {
 //     type Error = ();
 
@@ -247,7 +246,6 @@
 //     }
 // }
 
-
 // impl TryFrom<&Value> for u64 {
 //     type Error = ();
 
@@ -264,7 +262,6 @@
 //     }
 // }
 
-
 // impl<T> From<Option<T>> for Value
 // where
 //     T: Into<Value>,
@@ -341,7 +338,6 @@
 //     }
 // }
 
-
 use std::collections::HashMap;
 
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -362,7 +358,6 @@ pub enum Value {
     Some(Box<Value>),
 }
 
-
 impl Value {
     pub fn to_json_string(&self) -> String {
         match self {
@@ -385,10 +380,8 @@ impl Value {
             Value::None => {
                 // Still dicy on this
                 "\n".to_string()
-            },
-            Value::Some(x) => {
-                x.to_json_string()
             }
+            Value::Some(x) => x.to_json_string(),
         }
     }
 

diff --git a/utils/sv2_serde_json_macros/src/lib.rs b/utils/sv2_serde_json_macros/src/lib.rs
@@ -44,7 +44,6 @@ pub fn ser_json_derive(input: TokenStream) -> TokenStream {
         Data::Enum(data) => {
             let variants = data.variants.iter().map(|variant| {
                 let var_name = &variant.ident;
-
                 if variant.fields.is_empty() {
                     quote! {
                         #name::#var_name => {
@@ -63,7 +62,7 @@ pub fn ser_json_derive(input: TokenStream) -> TokenStream {
                     }
                 }
             });
-        
+
             quote! {
                 impl #name {
                     pub fn to_json_value(&self) -> sv2_serde_json::value::Value {
@@ -72,14 +71,14 @@ pub fn ser_json_derive(input: TokenStream) -> TokenStream {
                         }
                     }
                 }
-        
+
                 impl ToJsonValue for #name {
                     fn to_json_value(&self) -> sv2_serde_json::value::Value {
                         self.to_json_value()
                     }
                 }
             }
-        }        
+        }
         _ => unimplemented!("SerJson is only implemented for structs and enums"),
     };
 
@@ -130,7 +129,6 @@ pub fn de_json_derive(input: TokenStream) -> TokenStream {
         Data::Enum(data) => {
             let variants = data.variants.iter().map(|variant| {
                 let var_name = &variant.ident;
-
                 if variant.fields.is_empty() {
                     quote! {
                         stringify!(#var_name) => Ok(#name::#var_name),
@@ -148,7 +146,7 @@ pub fn de_json_derive(input: TokenStream) -> TokenStream {
                     }
                 }
             });
-        
+
             quote! {
                 impl #name {
                     pub fn from_json_value(value: &sv2_serde_json::value::Value) -> Result<Self, ()> {
@@ -163,15 +161,15 @@ pub fn de_json_derive(input: TokenStream) -> TokenStream {
                         }
                     }
                 }
-        
+
                 impl FromJsonValue for #name {
                     fn from_json_value(value: &sv2_serde_json::value::Value) -> Result<Self, ()> {
                         Self::from_json_value(value)
                     }
                 }
             }
         }
-        
+
         _ => unimplemented!("DeJson is only implemented for structs and enums"),
     };