From fb5e01de4883caf9e449081f47c2c87b795caa1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Bergstr=C3=B6m?= Date: Tue, 11 Aug 2020 23:48:21 +0200 Subject: [PATCH] Removed some comments & cargo fmt --- examples/enum.rs | 22 +++++++++++----------- examples/struct.rs | 22 +++++++++++----------- serde-diff-derive/src/serde_diff/mod.rs | 4 +--- src/difference.rs | 10 ++++++---- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/examples/enum.rs b/examples/enum.rs index 403a6a1..260b61b 100644 --- a/examples/enum.rs +++ b/examples/enum.rs @@ -3,8 +3,8 @@ use serde_diff::{Apply, Diff, SerdeDiff}; #[derive(SerdeDiff, Serialize, Deserialize, PartialEq, Debug)] enum TestEnum { - Structish {x : u32, y: u32}, - Enumish (i32, i32, i32), + Structish { x: u32, y: u32 }, + Enumish(i32, i32, i32), Unitish, } @@ -19,7 +19,7 @@ fn main() -> Result<(), Box> { let mut deserializer = serde_json::Deserializer::from_str(&json_data); let mut target = TestEnum::Structish { x: 0, y: 4 }; Apply::apply(&mut deserializer, &mut target)?; - + let result = TestEnum::Structish { x: 8, y: 4 }; assert_eq!(result, target); } @@ -31,22 +31,22 @@ fn main() -> Result<(), Box> { }; let json_data = serde_json::to_string(&Diff::serializable(&old, &new))?; let mut deserializer = serde_json::Deserializer::from_str(&json_data); - let mut target = TestEnum::Enumish ( 1, 2, 3); + let mut target = TestEnum::Enumish(1, 2, 3); Apply::apply(&mut deserializer, &mut target)?; - /* we can't apply changes from one enum variant + /* we can't apply changes from one enum variant to another, as there may be unfilled fields with no sane defaults, should there be an error? probably.*/ - let result = TestEnum::Enumish ( 1, 2, 3); + let result = TestEnum::Enumish(1, 2, 3); assert_eq!(result, target); } { - let old = TestEnum::Enumish (1, 2, 3); - let new = TestEnum::Enumish (1, 10, 3); + let old = TestEnum::Enumish(1, 2, 3); + let new = TestEnum::Enumish(1, 10, 3); let json_data = serde_json::to_string(&Diff::serializable(&old, &new))?; let mut deserializer = serde_json::Deserializer::from_str(&json_data); - let mut target = TestEnum::Enumish ( 4, 3, 2); + let mut target = TestEnum::Enumish(4, 3, 2); Apply::apply(&mut deserializer, &mut target)?; - let result = TestEnum::Enumish (4, 10, 2); + let result = TestEnum::Enumish(4, 10, 2); assert_eq!(result, target); } { @@ -54,7 +54,7 @@ fn main() -> Result<(), Box> { let new = TestEnum::Unitish; let json_data = serde_json::to_string(&Diff::serializable(&old, &new))?; let mut deserializer = serde_json::Deserializer::from_str(&json_data); - let mut target = TestEnum::Enumish ( 1, 2, 3); + let mut target = TestEnum::Enumish(1, 2, 3); Apply::apply(&mut deserializer, &mut target)?; let result = TestEnum::Unitish; assert_eq!(result, target); diff --git a/examples/struct.rs b/examples/struct.rs index ecbb54c..ef12bfe 100644 --- a/examples/struct.rs +++ b/examples/struct.rs @@ -13,7 +13,8 @@ struct Test3Struct; #[derive(SerdeDiff, Serialize, Deserialize, PartialEq, Debug)] struct Test4Struct -where T: SerdeDiff +where + T: SerdeDiff, { a: T, } @@ -34,18 +35,17 @@ fn main() -> Result<(), Box> { assert_eq!(result, target); } { - let old = Test2Struct (1, 2, 3); - let new = Test2Struct ( + let old = Test2Struct(1, 2, 3); + let new = Test2Struct( 5, // Differs from old.0, will be serialized - 2, - 3 + 2, 3, ); - let mut target = Test2Struct (4,5,6); + let mut target = Test2Struct(4, 5, 6); let json_data = serde_json::to_string(&Diff::serializable(&old, &new))?; let mut deserializer = serde_json::Deserializer::from_str(&json_data); Apply::apply(&mut deserializer, &mut target)?; - let result = Test2Struct ( 5,5,6 ); + let result = Test2Struct(5, 5, 6); assert_eq!(result, target); } { @@ -60,14 +60,14 @@ fn main() -> Result<(), Box> { assert_eq!(result, target); } { - let old = Test4Struct { a: 5}; - let new = Test4Struct { a: 7}; - let mut target = Test4Struct { a: 10}; + let old = Test4Struct { a: 5 }; + let new = Test4Struct { a: 7 }; + let mut target = Test4Struct { a: 10 }; let json_data = serde_json::to_string(&Diff::serializable(&old, &new))?; let mut deserializer = serde_json::Deserializer::from_str(&json_data); Apply::apply(&mut deserializer, &mut target)?; - let result = Test4Struct { a: 7}; + let result = Test4Struct { a: 7 }; assert_eq!(result, target); } Ok(()) diff --git a/serde-diff-derive/src/serde_diff/mod.rs b/serde-diff-derive/src/serde_diff/mod.rs index 3c86edc..e507baa 100644 --- a/serde-diff-derive/src/serde_diff/mod.rs +++ b/serde-diff-derive/src/serde_diff/mod.rs @@ -19,7 +19,6 @@ pub fn macro_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream { } else { // Go ahead and generate the code match generate(&input, struct_args) { - //Ok(v) => {eprintln!("{}", v); v}, Ok(v) => v, Err(v) => v, } @@ -31,7 +30,6 @@ pub fn macro_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream { } else { // Go ahead and generate the code match generate(&input, struct_args) { - //Ok(v) => {eprintln!("{}", v); v}, Ok(v) => v, Err(v) => v, } @@ -270,7 +268,7 @@ fn generate_arms(name: &syn::Ident, variant: Option<&syn::Ident>, fields: &syn:: while let Some(element) = ctx.next_path_element(seq)? { match element { #(#apply_fn_field_handlers)* - _ => ctx.skip_value(seq)? + _ => ctx.skip_value(seq)? } } } diff --git a/src/difference.rs b/src/difference.rs index ee16072..6a63dfb 100644 --- a/src/difference.rs +++ b/src/difference.rs @@ -71,16 +71,18 @@ impl<'a, S: SerializeSeq> DiffContext<'a, S> { self.element_stack .as_mut() .unwrap() - .push(ElementStackEntry::PathElement(DiffPathElementValue::EnumVariant( - Cow::Borrowed(variant_name), - ))); + .push(ElementStackEntry::PathElement( + DiffPathElementValue::EnumVariant(Cow::Borrowed(variant_name)), + )); } pub fn push_full_variant(&mut self) { self.element_stack .as_mut() .unwrap() - .push(ElementStackEntry::PathElement(DiffPathElementValue::FullEnumVariant)); + .push(ElementStackEntry::PathElement( + DiffPathElementValue::FullEnumVariant, + )); } /// Called when we visit a field. If the structure is recursive (i.e. struct within struct,