Merge pull request #643 from gwenn/clippy

Fix clippy warnings
kkawakam · Jul 31, 2022 · 05f94b1 · 05f94b1
2 parents ca62587 + 26db0f1
commit 05f94b1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 37 deletions.
diff --git a/src/binding.rs b/src/binding.rs
@@ -232,7 +232,6 @@ mod test {
         assert!(subtrie.is_some());
         let subtrie = subtrie.unwrap();
         let sub_result = subtrie.get(&evt);
-        assert!(sub_result.is_ok());
         assert!(sub_result.unwrap().is_some());
         let prefix = Event::from(KeyEvent::ctrl('O'));
         let subtrie = trie.get_raw_descendant(&prefix);

diff --git a/src/undo.rs b/src/undo.rs
@@ -255,24 +255,20 @@ impl Changeset {
         let mut count = 0;
         let mut waiting_for_begin = 0;
         let mut undone = false;
-        loop {
-            if let Some(change) = self.undos.pop() {
-                match change {
-                    Change::Begin => {
-                        waiting_for_begin -= 1;
-                    }
-                    Change::End => {
-                        waiting_for_begin += 1;
-                    }
-                    _ => {
-                        change.undo(line);
-                        undone = true;
-                    }
-                };
-                self.redos.push(change);
-            } else {
-                break;
-            }
+        while let Some(change) = self.undos.pop() {
+            match change {
+                Change::Begin => {
+                    waiting_for_begin -= 1;
+                }
+                Change::End => {
+                    waiting_for_begin += 1;
+                }
+                _ => {
+                    change.undo(line);
+                    undone = true;
+                }
+            };
+            self.redos.push(change);
             if waiting_for_begin <= 0 {
                 count += 1;
                 if count >= n {
@@ -292,24 +288,20 @@ impl Changeset {
     pub fn redo(&mut self, line: &mut LineBuffer) -> bool {
         let mut waiting_for_end = 0;
         let mut redone = false;
-        loop {
-            if let Some(change) = self.redos.pop() {
-                match change {
-                    Change::Begin => {
-                        waiting_for_end += 1;
-                    }
-                    Change::End => {
-                        waiting_for_end -= 1;
-                    }
-                    _ => {
-                        change.redo(line);
-                        redone = true;
-                    }
-                };
-                self.undos.push(change);
-            } else {
-                break;
-            }
+        while let Some(change) = self.redos.pop() {
+            match change {
+                Change::Begin => {
+                    waiting_for_end += 1;
+                }
+                Change::End => {
+                    waiting_for_end -= 1;
+                }
+                _ => {
+                    change.redo(line);
+                    redone = true;
+                }
+            };
+            self.undos.push(change);
             if waiting_for_end <= 0 {
                 break;
             }