From 9c00a7f30a5464a9790511327bfe4f7c0fbe78c6 Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Tue, 25 Jun 2024 14:04:43 +0100 Subject: [PATCH] Getting rid of "Debug" derived implementation in the macro --- crates/bft-json-crdt/bft-crdt-derive/src/lib.rs | 14 +++++++------- side-node/src/bft_crdt/mod.rs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/bft-json-crdt/bft-crdt-derive/src/lib.rs b/crates/bft-json-crdt/bft-crdt-derive/src/lib.rs index 51ccedb..d53acfd 100644 --- a/crates/bft-json-crdt/bft-crdt-derive/src/lib.rs +++ b/crates/bft-json-crdt/bft-crdt-derive/src/lib.rs @@ -109,13 +109,13 @@ pub fn derive_json_crdt(input: OgTokenStream) -> OgTokenStream { } } - impl #impl_generics std::fmt::Debug for #ident #ty_generics #where_clause { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - let mut fields = Vec::new(); - #(fields.push(format!("{}", #ident_strings.to_string()));)* - write!(f, "{{ {:?} }}", fields.join(", ")) - } - } + // impl #impl_generics std::fmt::Debug for #ident #ty_generics #where_clause { + // fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + // let mut fields = Vec::new(); + // #(fields.push(format!("{}", #ident_strings.to_string()));)* + // write!(f, "{{ {:?} }}", fields.join(", ")) + // } + // } impl #impl_generics #crate_name::json_crdt::CrdtNode for #ident #ty_generics #where_clause { fn apply(&mut self, op: #crate_name::op::Op<#crate_name::json_crdt::JsonValue>) -> #crate_name::json_crdt::OpState { diff --git a/side-node/src/bft_crdt/mod.rs b/side-node/src/bft_crdt/mod.rs index 5025322..8dbc346 100644 --- a/side-node/src/bft_crdt/mod.rs +++ b/side-node/src/bft_crdt/mod.rs @@ -9,7 +9,7 @@ pub mod keys; pub mod websocket; #[add_crdt_fields] -#[derive(Clone, CrdtNode, Serialize, Deserialize)] +#[derive(Clone, CrdtNode, Serialize, Deserialize, Debug)] pub struct TransactionList { pub list: ListCrdt, } @@ -22,7 +22,7 @@ impl TransactionList { /// A fake Transaction struct we can use as a simulated payload #[add_crdt_fields] -#[derive(Clone, CrdtNode, Serialize, Deserialize, PartialEq)] +#[derive(Clone, CrdtNode, Serialize, Deserialize, PartialEq, Debug)] pub struct Transaction { from: String, to: String,