feat: drop redundant lifetime constraints from WatchableData::should_…

…notify, add default implementation for WatchableData::update

chombot-common/src/data_watcher.rs

@@ -9,19 +9,22 @@ use tokio::time::sleep;
 
 const DATA_UPDATE_INTERVAL: Duration = Duration::from_secs(60 * 10);
 
-pub trait WatchableData {
+pub trait WatchableData: Sized {
     type Diff;
 
     #[must_use]
-    fn should_notify<'a>(&'a self, new: &'a Self) -> Option<Self::Diff>;
-    fn update(&mut self, new: Self);
+    fn should_notify(&self, new: &Self) -> Option<Self::Diff>;
+
+    fn update(&mut self, new: Self) {
+        *self = new;
+    }
 }
 
 impl<T: WatchableData> WatchableData for Option<T> {
     type Diff = T::Diff;
 
     #[must_use]
-    fn should_notify<'a>(&'a self, new: &'a Self) -> Option<T::Diff> {
+    fn should_notify(&self, new: &Self) -> Option<T::Diff> {
         match (&self, &new) {
             (Some(o), Some(n)) => o.should_notify(n),
             _ => None,

chombot-common/src/tournaments_watcher/ema.rs

@@ -46,17 +46,13 @@ impl Tournaments {
 impl WatchableData for Tournaments {
     type Diff = TournamentStatuses;
 
-    fn should_notify<'a>(&'a self, new: &'a Self) -> Option<Self::Diff> {
+    fn should_notify(&self, new: &Self) -> Option<Self::Diff> {
         if self == new {
             None
         } else {
             Some(tournaments_diff(self, new))
         }
     }
-
-    fn update(&mut self, new: Self) {
-        *self = new;
-    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]

chombot-kcc/src/ranking_watcher/usma.rs

@@ -48,18 +48,14 @@ impl Ranking {
 impl WatchableData for Ranking {
     type Diff = Vec<RankingEntry>;
 
-    fn should_notify<'a>(&'a self, new: &'a Self) -> Option<Vec<RankingEntry>> {
+    fn should_notify(&self, new: &Self) -> Option<Vec<RankingEntry>> {
         let new_changed = new.get_changed();
         if new_changed.is_empty() || new_changed == self.get_changed() {
             None
         } else {
             Some(new_changed.into_iter().cloned().collect())
         }
     }
-
-    fn update(&mut self, new: Self) {
-        *self = new;
-    }
 }
 
 fn first_element_child<'a>(e: &'a ElementRef) -> Option<&'a Element> {