Format PersistenceNotifierGuard methods

Author: wpaulino

lightning/src/ln/channelmanager.rs

@@ -2839,9 +2839,9 @@ impl<'a> PersistenceNotifierGuard<'a, fn() -> NotifyOption> {
 		Self::optionally_notify(cm, || -> NotifyOption { NotifyOption::DoPersist })
 	}
 
-	#[rustfmt::skip]
-	fn optionally_notify<F: FnOnce() -> NotifyOption, C: AChannelManager>(cm: &'a C, persist_check: F)
-	-> PersistenceNotifierGuard<'a, impl FnOnce() -> NotifyOption> {
+	fn optionally_notify<F: FnOnce() -> NotifyOption, C: AChannelManager>(
+		cm: &'a C, persist_check: F,
+	) -> PersistenceNotifierGuard<'a, impl FnOnce() -> NotifyOption> {
 		let read_guard = cm.get_cm().total_consistency_lock.read().unwrap();
 		let force_notify = cm.get_cm().process_background_events();
 
@@ -2855,8 +2855,12 @@ impl<'a> PersistenceNotifierGuard<'a, fn() -> NotifyOption> {
 				match (notify, force_notify) {
 					(NotifyOption::DoPersist, _) => NotifyOption::DoPersist,
 					(_, NotifyOption::DoPersist) => NotifyOption::DoPersist,
-					(NotifyOption::SkipPersistHandleEvents, _) => NotifyOption::SkipPersistHandleEvents,
-					(_, NotifyOption::SkipPersistHandleEvents) => NotifyOption::SkipPersistHandleEvents,
+					(NotifyOption::SkipPersistHandleEvents, _) => {
+						NotifyOption::SkipPersistHandleEvents
+					},
+					(_, NotifyOption::SkipPersistHandleEvents) => {
+						NotifyOption::SkipPersistHandleEvents
+					},
 					_ => NotifyOption::SkipPersistNoEvents,
 				}
 			}),
@@ -2882,15 +2886,13 @@ impl<'a> PersistenceNotifierGuard<'a, fn() -> NotifyOption> {
 }
 
 impl<'a, F: FnOnce() -> NotifyOption> Drop for PersistenceNotifierGuard<'a, F> {
-	#[rustfmt::skip]
 	fn drop(&mut self) {
 		match (self.should_persist.take().unwrap())() {
 			NotifyOption::DoPersist => {
 				self.needs_persist_flag.store(true, Ordering::Release);
 				self.event_persist_notifier.notify()
 			},
-			NotifyOption::SkipPersistHandleEvents =>
-				self.event_persist_notifier.notify(),
+			NotifyOption::SkipPersistHandleEvents => self.event_persist_notifier.notify(),
 			NotifyOption::SkipPersistNoEvents => {},
 		}
 	}