From 4cbeadaeeb74ee34d6712e82e901e22bc4d55c98 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 4 Dec 2024 08:15:45 -0600 Subject: [PATCH] Changes names for import's sake --- src/persistence.rs | 8 ++++---- src/votes/helper_functions.rs | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/persistence.rs b/src/persistence.rs index 4c7f877..d278473 100644 --- a/src/persistence.rs +++ b/src/persistence.rs @@ -23,7 +23,7 @@ where /// /// This macro is direct sugarcoating of the load_from_disk macro #[macro_export] -macro_rules! load_it { +macro_rules! load_from_reader { ($r_type:ident, $path:expr) => { Arc::new(std::sync::Mutex::new(load_from_reader::<$r_type, File>( File::open($path).map_err(IdleError::BackupReadError)?, @@ -56,7 +56,7 @@ where /// /// save_it!() #[macro_export] -macro_rules! save_it { +macro_rules! save_to_writer { ($value:expr, $r_type:ident, $path:expr) => { save_to_writer::<&$r_type, File>( &$value.lock().unwrap(), @@ -99,8 +99,8 @@ mod tests { } let _ = remove_dir_all("test"); let _ = create_dir("test"); - save_it!(&event_og, ListPendingEvents, "test/testwrite.json"); - let event_new = load_it!(ListPendingEvents, "test/testwrite.json"); + save_to_writer!(&event_og, ListPendingEvents, "test/testwrite.json"); + let event_new = load_from_reader!(ListPendingEvents, "test/testwrite.json"); assert_eq!( event_og.lock().unwrap().to_owned(), event_new.lock().unwrap().to_owned() diff --git a/src/votes/helper_functions.rs b/src/votes/helper_functions.rs index dbdc0c1..fafc1e0 100644 --- a/src/votes/helper_functions.rs +++ b/src/votes/helper_functions.rs @@ -10,9 +10,9 @@ use super::{ }; use crate::{ ids::EventIdType, - load_it, + load_from_reader, persistence::{load_from_reader, save_to_writer}, - save_it, IdleError, + save_to_writer, IdleError, }; /// Adds a parsed vote to the list of planned events. @@ -213,31 +213,31 @@ pub struct EventHolder { impl EventHolder { pub fn try_load_from_disk() -> Result { Ok(Self { - pending_events: load_it!(ListPendingEvents, "data/pending_events.json"), - ongoing_events: load_it!(ListOngoingEvents, "data/ongoin_events.json"), - closed_events: load_it!(ListClosedEvents, "data/closed_events.json"), - old_date: load_it!(NaiveDate, "data/old_date.json"), + pending_events: load_from_reader!(ListPendingEvents, "data/pending_events.json"), + ongoing_events: load_from_reader!(ListOngoingEvents, "data/ongoin_events.json"), + closed_events: load_from_reader!(ListClosedEvents, "data/closed_events.json"), + old_date: load_from_reader!(NaiveDate, "data/old_date.json"), ..Default::default() }) } pub fn try_save_to_disk(holder: EventHolder) -> Result<(), IdleError> { - save_it!( + save_to_writer!( holder.pending_events, ListPendingEvents, "data/pending_events.json" ); - save_it!( + save_to_writer!( holder.ongoing_events, ListOngoingEvents, "data/ongoing_events.json" ); - save_it!( + save_to_writer!( holder.closed_events, ListClosedEvents, "data/closed_events.json" ); - save_it!(&holder.old_date, NaiveDate, "data/old_date.json"); + save_to_writer!(&holder.old_date, NaiveDate, "data/old_date.json"); Ok(()) } }