From 3006842a48b991d057cd1c7d99da1e781857c1e6 Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo@paolo565.org>
Date: Wed, 4 Mar 2020 11:57:05 +0100
Subject: [PATCH 1/2] Run clippy

---
 src/element_ref/mod.rs | 11 ++++-------
 src/html/mod.rs        |  2 +-
 src/html/tree_sink.rs  | 12 ++++++------
 src/main.rs            |  4 ++--
 src/selector.rs        |  7 +++----
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/element_ref/mod.rs b/src/element_ref/mod.rs
index 54febb42..9780b2c0 100644
--- a/src/element_ref/mod.rs
+++ b/src/element_ref/mod.rs
@@ -20,7 +20,7 @@ pub struct ElementRef<'a> {
 
 impl<'a> ElementRef<'a> {
     fn new(node: NodeRef<'a, Node>) -> Self {
-        ElementRef { node: node }
+        ElementRef { node }
     }
 
     /// Wraps a `NodeRef` only if it references a `Node::Element`.
@@ -42,16 +42,13 @@ impl<'a> ElementRef<'a> {
         let mut inner = self.traverse();
         inner.next(); // Skip Edge::Open(self).
 
-        Select {
-            inner: inner,
-            selector: selector,
-        }
+        Select { inner, selector }
     }
 
     fn serialize(&self, traversal_scope: TraversalScope) -> String {
         let opts = SerializeOpts {
             scripting_enabled: false, // It's not clear what this does.
-            traversal_scope: traversal_scope,
+            traversal_scope,
             create_missing_parent: false,
         };
         let mut buf = Vec::new();
@@ -120,7 +117,7 @@ impl<'a> Iterator for Text<'a> {
     fn next(&mut self) -> Option<&'a str> {
         for edge in &mut self.inner {
             if let Edge::Open(node) = edge {
-                if let &Node::Text(ref text) = node.value() {
+                if let Node::Text(ref text) = node.value() {
                     return Some(&*text);
                 }
             }
diff --git a/src/html/mod.rs b/src/html/mod.rs
index 4ea744d9..c5dd086a 100644
--- a/src/html/mod.rs
+++ b/src/html/mod.rs
@@ -87,7 +87,7 @@ impl Html {
     pub fn select<'a, 'b>(&'a self, selector: &'b Selector) -> Select<'a, 'b> {
         Select {
             inner: self.tree.nodes(),
-            selector: selector,
+            selector,
         }
     }
 
diff --git a/src/html/tree_sink.rs b/src/html/tree_sink.rs
index 7e850312..420fd7b0 100644
--- a/src/html/tree_sink.rs
+++ b/src/html/tree_sink.rs
@@ -86,9 +86,9 @@ impl TreeSink for Html {
         system_id: StrTendril,
     ) {
         let doctype = Doctype {
-            name: name,
-            public_id: public_id,
-            system_id: system_id,
+            name,
+            public_id,
+            system_id,
         };
         self.tree.root_mut().append(Node::Doctype(doctype));
     }
@@ -117,7 +117,7 @@ impl TreeSink for Html {
                         _ => unreachable!(),
                     }
                 } else {
-                    parent.append(Node::Text(Text { text: text }));
+                    parent.append(Node::Text(Text { text }));
                 }
             }
         }
@@ -141,7 +141,7 @@ impl TreeSink for Html {
         }
 
         let mut sibling = self.tree.get_mut(*sibling).unwrap();
-        if !sibling.parent().is_none() {
+        if sibling.parent().is_some() {
             match new_node {
                 NodeOrText::AppendNode(id) => {
                     sibling.insert_id_before(id);
@@ -159,7 +159,7 @@ impl TreeSink for Html {
                             _ => unreachable!(),
                         }
                     } else {
-                        sibling.insert_before(Node::Text(Text { text: text }));
+                        sibling.insert_before(Node::Text(Text { text }));
                     }
                 }
             }
diff --git a/src/main.rs b/src/main.rs
index 2a47de13..91ab834f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -122,11 +122,11 @@ fn main() {
         query(&input, &output, &selector, &mut io::stdin())
     } else {
         files
-            .into_iter()
+            .iter()
             .map(File::open)
             .map(Result::unwrap)
             .map(|mut f| query(&input, &output, &selector, &mut f))
-            .fold(false, |a, m| a || m)
+            .any(|m| m)
     };
 
     process::exit(if matched { 0 } else { 1 });
diff --git a/src/selector.rs b/src/selector.rs
index ce6a549a..5ce0199f 100644
--- a/src/selector.rs
+++ b/src/selector.rs
@@ -4,7 +4,6 @@ use std::fmt;
 
 use smallvec::SmallVec;
 
-use cssparser;
 use html5ever::{LocalName, Namespace};
 use selectors::parser::SelectorParseErrorKind;
 use selectors::{matching, parser, visitor};
@@ -23,9 +22,9 @@ pub struct Selector {
 impl Selector {
     /// Parses a CSS selector group.
 
-    pub fn parse<'t, 'i>(
-        selectors: &'i str,
-    ) -> Result<Self, cssparser::ParseError<'i, SelectorParseErrorKind<'i>>> {
+    pub fn parse(
+        selectors: &'_ str,
+    ) -> Result<Self, cssparser::ParseError<'_, SelectorParseErrorKind<'_>>> {
         let mut parser_input = cssparser::ParserInput::new(selectors);
         let mut parser = cssparser::Parser::new(&mut parser_input);
         parser::SelectorList::parse(&Parser, &mut parser).map(|list| Selector { selectors: list.0 })

From 348c491ed47c041f23bdf7e42aa8b5e9d9602c2c Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo@paolo565.org>
Date: Wed, 4 Mar 2020 12:05:29 +0100
Subject: [PATCH 2/2] Also run tests on Rust 1.36.0

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8c91a741..d95c0597 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ rust:
   - stable
   - beta
   - nightly
+  - 1.36.0
+
 matrix:
   allow_failures:
     - rust: nightly