🐛 (MapExt): Fix a bug where when k1 exists and equals k2, the correct…

… behavior should be to do nothing and return `Ok(())`
opensound-org · Nov 22, 2024 · 78fd143 · 78fd143
1 parent ca6a37a
commit 78fd143
Showing 1 changed file with 29 additions and 1 deletion.
diff --git a/src/collections.rs b/src/collections.rs
@@ -25,7 +25,9 @@ pub trait MapExt<K, Q: ?Sized = K> {
     ///
     /// If k1 does not exist, return `Err(ReplaceKeyErr::OldKeyNotExist)`.
     ///
-    /// If k1 exists and k2 also exists, return `Err(ReplaceKeyErr::NewKeyOccupied)`.
+    /// Otherwise, if k2 and k1 are equal, do nothing and return `Ok(())`.
+    ///
+    /// Otherwise, if k2 also exists, return `Err(ReplaceKeyErr::NewKeyOccupied)`.
     ///
     /// Otherwise, return `Ok(())` after the replacement is completed.
     fn replace_key(&mut self, k1: &Q, k2: K) -> Result<(), ReplaceKeyErr>
@@ -44,6 +46,10 @@ where
             return Err(ReplaceKeyErr::OldKeyNotExist);
         }
 
+        if k1 == k2.borrow() {
+            return Ok(());
+        }
+
         if self.contains_key(k2.borrow()) {
             return Err(ReplaceKeyErr::NewKeyOccupied);
         }
@@ -64,6 +70,10 @@ where
             return Err(ReplaceKeyErr::OldKeyNotExist);
         }
 
+        if k1 == k2.borrow() {
+            return Ok(());
+        }
+
         if self.contains_key(k2.borrow()) {
             return Err(ReplaceKeyErr::NewKeyOccupied);
         }
@@ -91,10 +101,19 @@ mod tests {
             map.replace_key("k3", "k2".to_string()),
             Err(ReplaceKeyErr::OldKeyNotExist)
         );
+        assert_eq!(
+            map.replace_key("k3", "k3".to_string()),
+            Err(ReplaceKeyErr::OldKeyNotExist)
+        );
         assert_eq!(
             map.replace_key("k3", "k4".to_string()),
             Err(ReplaceKeyErr::OldKeyNotExist)
         );
+
+        let cloned = map.clone();
+        assert_eq!(map.replace_key("k1", "k1".to_string()), Ok(()));
+        assert_eq!(map, cloned);
+
         assert_eq!(
             map.replace_key("k1", "k2".to_string()),
             Err(ReplaceKeyErr::NewKeyOccupied)
@@ -118,10 +137,19 @@ mod tests {
             map.replace_key("k3", "k2".to_string()),
             Err(ReplaceKeyErr::OldKeyNotExist)
         );
+        assert_eq!(
+            map.replace_key("k3", "k3".to_string()),
+            Err(ReplaceKeyErr::OldKeyNotExist)
+        );
         assert_eq!(
             map.replace_key("k3", "k4".to_string()),
             Err(ReplaceKeyErr::OldKeyNotExist)
         );
+
+        let cloned = map.clone();
+        assert_eq!(map.replace_key("k1", "k1".to_string()), Ok(()));
+        assert_eq!(map, cloned);
+
         assert_eq!(
             map.replace_key("k1", "k2".to_string()),
             Err(ReplaceKeyErr::NewKeyOccupied)