Fix new clippy warnings

matrix-org · Jul 20, 2023 · b37537e · b37537e
1 parent 6a69dfa
commit b37537e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/crates/wysiwyg/src/dom/dom_creation_error.rs b/crates/wysiwyg/src/dom/dom_creation_error.rs
@@ -26,12 +26,6 @@ pub struct HtmlParseError {
 }
 
 impl HtmlParseError {
-    pub fn default() -> Self {
-        Self {
-            parse_errors: vec![],
-        }
-    }
-
     pub fn new(parse_errors: Vec<String>) -> Self {
         Self { parse_errors }
     }

diff --git a/crates/wysiwyg/src/dom/dom_methods.rs b/crates/wysiwyg/src/dom/dom_methods.rs
@@ -255,8 +255,7 @@ where
 
         // We repeatedly delete to ensure anything that became empty because
         // of deletions is itself deleted.
-        while !to_delete.is_empty() {
-            let handle = to_delete.pop().unwrap();
+        while let Some(handle) = to_delete.pop() {
             if handle.is_root() {
                 continue;
             }

diff --git a/crates/wysiwyg/src/dom/insert_parent.rs b/crates/wysiwyg/src/dom/insert_parent.rs
@@ -6,7 +6,7 @@ impl<S> Dom<S>
 where
     S: UnicodeString,
 {
-    #[allow(dead_code)]
+    #[allow(dead_code, clippy::let_and_return)]
     /// Insert a node and make this node the parent of a given range.
     pub fn insert_parent(
         &mut self,

diff --git a/crates/wysiwyg/src/dom/parser/parse.rs b/crates/wysiwyg/src/dom/parser/parse.rs
@@ -710,7 +710,7 @@ fn convert_text<S: UnicodeString>(
             return;
         }
 
-        for (i, part) in contents.split("@room").into_iter().enumerate() {
+        for (i, part) in contents.split("@room").enumerate() {
             if i > 0 {
                 node.append_child(DomNode::Mention(
                     DomNode::new_at_room_mention(vec![]),