Make clippy happy

Author: domenic

src/annotate_attributes.rs

@@ -142,11 +142,11 @@ impl Processor {
                 let mut variant_comment = None;
                 let mut variant_str = None;
                 for node in description.iter() {
-                    if let NodeData::Comment { contents } = &node.data {
-                        if contents.trim().starts_with("or:") {
-                            variant_comment = Some(node);
-                            variant_str = Some(StrTendril::from(contents.trim()[3..].trim_start()));
-                        }
+                    if let NodeData::Comment { contents } = &node.data
+                        && contents.trim().starts_with("or:")
+                    {
+                        variant_comment = Some(node);
+                        variant_str = Some(StrTendril::from(contents.trim()[3..].trim_start()));
                     }
                 }
 
@@ -276,14 +276,14 @@ impl Processor {
             let mut dd_children = dd.children.borrow_mut();
             if has_special_semantics {
                 // Replace the trailing period with a separating colon.
-                if let Some(last) = dd_children.last_mut() {
-                    if let NodeData::Text { contents } = &last.data {
-                        let mut text = contents.borrow_mut();
-                        *text = StrTendril::from(
-                            text.trim_end_matches(|c: char| c.is_ascii_whitespace() || c == '.'),
-                        );
-                        text.push_slice(": ");
-                    }
+                if let Some(last) = dd_children.last_mut()
+                    && let NodeData::Text { contents } = &last.data
+                {
+                    let mut text = contents.borrow_mut();
+                    *text = StrTendril::from(
+                        text.trim_end_matches(|c: char| c.is_ascii_whitespace() || c == '.'),
+                    );
+                    text.push_slice(": ");
                 }
             } else {
                 // Insert an em dash.

src/dom_utils.rs

@@ -137,10 +137,9 @@ pub fn scan_dom<F: FnMut(&Handle)>(handle: &Handle, f: &mut F) {
         template_contents: ref tc,
         ..
     } = handle.data
+        && let Some(ref tc_handle) = *tc.borrow()
     {
-        if let Some(ref tc_handle) = *tc.borrow() {
-            scan_dom(tc_handle, f);
-        }
+        scan_dom(tc_handle, f);
     }
 }
 

src/tag_omission.rs

@@ -67,19 +67,17 @@ impl Processor {
         // If we encounter the Void elements section, look for the next dt.
         if node.is_html_element(&local_name!("dfn"))
             && node.text_content().trim() == "Void elements"
-        {
-            if let Some(dt) = node
+            && let Some(dt) = node
                 .parent_node()
                 .filter(|n| n.is_html_element(&local_name!("dt")))
-            {
-                for dd in dom_utils::dt_descriptions(&dt) {
-                    dom_utils::scan_dom(&dd, &mut |n| {
-                        if n.is_html_element(&local_name!("code")) {
-                            let info = self.elements.entry(n.text_content()).or_default();
-                            info.is_void_element = true;
-                        }
-                    });
-                }
+        {
+            for dd in dom_utils::dt_descriptions(&dt) {
+                dom_utils::scan_dom(&dd, &mut |n| {
+                    if n.is_html_element(&local_name!("code")) {
+                        let info = self.elements.entry(n.text_content()).or_default();
+                        info.is_void_element = true;
+                    }
+                });
             }
         }
 
@@ -91,12 +89,13 @@ impl Processor {
         }
 
         // If we see a <dl class="element">, record that.
-        if node.is_html_element(&local_name!("dl")) && node.has_class("element") {
-            if let Some(elem) = std::mem::take(&mut self.most_recent_element_dfn) {
-                let info = self.elements.entry(elem).or_default();
-                if info.dl.is_none() {
-                    info.dl = Some(node.clone());
-                }
+        if node.is_html_element(&local_name!("dl"))
+            && node.has_class("element")
+            && let Some(elem) = std::mem::take(&mut self.most_recent_element_dfn)
+        {
+            let info = self.elements.entry(elem).or_default();
+            if info.dl.is_none() {
+                info.dl = Some(node.clone());
             }
         }
     }