Replace a use of clone() + assignment with std::mem::take().

google · Nov 14, 2023 · 7ae1614 · 7ae1614
1 parent 23545ef
commit 7ae1614
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/i18n-helpers/src/lib.rs b/i18n-helpers/src/lib.rs
@@ -218,12 +218,6 @@ pub fn group_events<'a>(events: &'a [(usize, Event<'a>)]) -> Vec<Group<'a>> {
                 ..self
             }
         }
-        fn clear_translator_comments(self) -> Self {
-            Self {
-                translator_comments: vec![],
-                ..self
-            }
-        }
     }
 
     #[derive(Debug)]
@@ -238,7 +232,7 @@ pub fn group_events<'a>(events: &'a [(usize, Event<'a>)]) -> Vec<Group<'a>> {
             self,
             idx: usize,
             events: &'a [(usize, Event<'a>)],
-            ctx: GroupingContext,
+            mut ctx: GroupingContext,
         ) -> (Vec<Group<'a>>, GroupingContext) {
             match self {
                 State::Translate(start) => {
@@ -257,10 +251,12 @@ pub fn group_events<'a>(events: &'a [(usize, Event<'a>)]) -> Vec<Group<'a>> {
                             vec![Group::Translate(
                                 events[start..idx].into(),
                                 GroupExtra {
-                                    translator_comments: ctx.translator_comments.clone(),
+                                    translator_comments: std::mem::take(
+                                        &mut ctx.translator_comments,
+                                    ),
                                 },
                             )],
-                            ctx.clear_translator_comments(),
+                            ctx,
                         )
                     }
                 }