Merge bc66c10 into c91d9f4

projectfluent · Oct 27, 2022 · db96054 · db96054
2 parents c91d9f4 + bc66c10
commit db96054
Showing 1 changed file with 31 additions and 4 deletions.
diff --git a/fluent-bundle/src/args.rs b/fluent-bundle/src/args.rs
@@ -74,11 +74,10 @@ impl<'args> FluentArgs<'args> {
         V: Into<FluentValue<'args>>,
     {
         let key = key.into();
-        let idx = match self.0.binary_search_by_key(&&key, |(k, _)| k) {
-            Ok(idx) => idx,
-            Err(idx) => idx,
+        match self.0.binary_search_by_key(&&key, |(k, _)| k) {
+            Ok(idx) => self.0[idx] = (key, value.into()),
+            Err(idx) => self.0.insert(idx, (key, value.into())),
         };
-        self.0.insert(idx, (key, value.into()));
     }
 
     pub fn iter(&self) -> impl Iterator<Item = (&str, &FluentValue)> {
@@ -118,3 +117,31 @@ impl<'args> IntoIterator for FluentArgs<'args> {
         self.0.into_iter()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn replace_existing_arguments() {
+        let mut args = FluentArgs::new();
+
+        args.set("name", "John");
+        args.set("emailCount", 5);
+        assert_eq!(args.0.len(), 2);
+        assert_eq!(
+            args.get("name"),
+            Some(&FluentValue::String(Cow::Borrowed("John")))
+        );
+        assert_eq!(args.get("emailCount"), Some(&FluentValue::try_number(5)));
+
+        args.set("name", "Jane");
+        args.set("emailCount", 7);
+        assert_eq!(args.0.len(), 2);
+        assert_eq!(
+            args.get("name"),
+            Some(&FluentValue::String(Cow::Borrowed("Jane")))
+        );
+        assert_eq!(args.get("emailCount"), Some(&FluentValue::try_number(7)));
+    }
+}