better code

Author: pxseu

crabdis-core/src/parsers/resp/mod.rs

@@ -778,7 +778,7 @@ mod tests {
 
         let not_expired = Value::Expire((
             Arc::new(Value::String("test".into())),
-            Instant::now() + Duration::from_secs(60),
+            Instant::now() + Duration::from_mins(1),
         ));
 
         assert!(!not_expired.expired());
@@ -811,7 +811,7 @@ mod tests {
         let inner = Value::String("test".into());
         let expired = Value::Expire((
             Arc::new(inner.clone()),
-            Instant::now() + Duration::from_secs(60),
+            Instant::now() + Duration::from_mins(1),
         ));
 
         assert_eq!(expired.inner(), &inner);

crabdis-macros/Cargo.toml

@@ -3,7 +3,7 @@ name = "crabdis-macros"
 description = "Macros for Crabdis"
 readme = "../README.md"
 keywords = ["redis", "resp", "protocol", "serialization"]
-categories = ["macros", "network-programming"]
+categories = ["network-programming"]
 version.workspace = true
 edition.workspace = true
 license.workspace = true

crabdis/src/storage/mod.rs

@@ -69,8 +69,7 @@ impl RdbConfig {
             last_save_time: AtomicU64::new(
                 std::time::SystemTime::now()
                     .duration_since(std::time::UNIX_EPOCH)
-                    .map(|d| d.as_secs())
-                    .unwrap_or(0),
+                    .map_or(0, |d| d.as_secs()),
             ),
             bgsave_in_progress: AtomicU64::new(0),
         }
@@ -110,8 +109,7 @@ impl RdbConfig {
         self.last_save_time.store(
             std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
-                .map(|d| d.as_secs())
-                .unwrap_or(0),
+                .map_or(0, |d| d.as_secs()),
             Ordering::Relaxed,
         );
     }
@@ -132,8 +130,7 @@ impl RdbConfig {
         let last_save = self.last_save_time.load(Ordering::Relaxed);
         let now = std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)
-            .map(|d| d.as_secs())
-            .unwrap_or(0);
+            .map_or(0, |d| d.as_secs());
         let elapsed = now.saturating_sub(last_save);
 
         let save_points = self.save_points.read().await;

crabdis/src/storage/rdb.rs

@@ -62,8 +62,7 @@ pub async fn save_rdb(state: &State) -> Result<()> {
     // Try to acquire the save lock (compare-and-swap from 0 to timestamp)
     let now = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
-        .map(|d| d.as_secs())
-        .unwrap_or(1); // Use 1 as minimum to distinguish from "not in progress"
+        .map_or(1, |d| d.as_secs()); // Use 1 as minimum to distinguish from "not in progress"
 
     if state
         .rdb_config
@@ -128,8 +127,7 @@ pub fn bgsave_rdb(state: Arc<State>) -> Result<()> {
     // Try to acquire the save lock (compare-and-swap from 0 to timestamp)
     let now = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
-        .map(|d| d.as_secs())
-        .unwrap_or(1); // Use 1 as minimum to distinguish from "not in progress"
+        .map_or(1, |d| d.as_secs()); // Use 1 as minimum to distinguish from "not in progress"
 
     if state
         .rdb_config