Cleanup merge logic

squidowl · Sep 18, 2024 · f6028d1 · f6028d1
1 parent fcf4516
commit f6028d1
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/data/src/history/metadata.rs b/data/src/history/metadata.rs
@@ -17,20 +17,12 @@ pub struct Metadata {
 impl Metadata {
  pub fn merge(self, other: Self) -> Self {
  Self {
- read_marker: self
- .read_marker
- .zip(other.read_marker)
- .map(|(a, b)| a.max(b))
- .or(self.read_marker)
- .or(other.read_marker),
+ read_marker: self.read_marker.max(other.read_marker),
  }
  }
 
  pub fn update_read_marker(&mut self, read_marker: ReadMarker) {
- self.read_marker = Some(
- self.read_marker
- .map_or(read_marker, |marker| marker.max(read_marker)),
- );
+ self.read_marker = self.read_marker.max(Some(read_marker));
  }
 
  pub fn updated(self, messages: &[Message]) -> Self {