Merge pull request #69 from causal-agent/update-deps

Update dependencies

Author: cfvescovo

.gitignore

@@ -1,3 +1,4 @@
 target
 *.bk
 Cargo.lock
+.idea

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scraper"
 version = "0.12.0"
-edition = "2018"
+edition = "2021"
 
 description = "HTML parsing and querying with CSS selectors"
 keywords = ["html", "css", "selector", "scraping"]

README.md

@@ -1,5 +1,7 @@
 # scraper
 
+[![crates.io package](https://repology.org/badge/version-for-repo/crates_io/rust:scraper.svg)](https://repology.org/project/rust:scraper/versions)
+![test](https://github.com/causal-agent/scraper/actions/workflows/test.yml/badge.svg)
 [![Join the chat at https://gitter.im/scraper-rs/community](https://badges.gitter.im/scraper-rs/community.svg)](https://gitter.im/scraper-rs/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 HTML parsing and querying with CSS selectors.
@@ -127,10 +129,14 @@ let text = h1.text().collect::<Vec<_>>();
 assert_eq!(vec!["Hello, ", "world!"], text);
 ```
 
-# Contributing
+## Contributing
 
 Please feel free to open pull requests. If you're planning on implementing
 something big (i.e. not fixing a typo, a small bug fix, minor refactor, etc)
 then please open an issue first.
 
+## Stargazers over time
+
+[![Stargazers over time](https://starchart.cc/causal-agent/scraper.svg)](https://starchart.cc/causal-agent/scraper)
+
 License: ISC

src/element_ref/mod.rs

@@ -43,7 +43,7 @@ impl<'a> ElementRef<'a> {
         inner.next(); // Skip Edge::Open(self).
 
         Select {
-            scope: self.clone(),
+            scope: *self,
             inner,
             selector,
         }

src/main.rs

@@ -70,7 +70,7 @@ fn main() {
     let args: Vec<String> = env::args().collect();
     let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
-        Err(f) => panic!(f.to_string()),
+        Err(f) => panic!("{}", f.to_string()),
     };
     if matches.opt_present("h") {
         print!(

src/node.rs

@@ -38,50 +38,32 @@ pub enum Node {
 impl Node {
     /// Returns true if node is the document root.
     pub fn is_document(&self) -> bool {
-        match *self {
-            Node::Document => true,
-            _ => false,
-        }
+        matches!(*self, Node::Document)
     }
 
     /// Returns true if node is the fragment root.
     pub fn is_fragment(&self) -> bool {
-        match *self {
-            Node::Fragment => true,
-            _ => false,
-        }
+        matches!(*self, Node::Fragment)
     }
 
     /// Returns true if node is a doctype.
     pub fn is_doctype(&self) -> bool {
-        match *self {
-            Node::Doctype(_) => true,
-            _ => false,
-        }
+        matches!(*self, Node::Doctype(_))
     }
 
     /// Returns true if node is a comment.
     pub fn is_comment(&self) -> bool {
-        match *self {
-            Node::Comment(_) => true,
-            _ => false,
-        }
+        matches!(*self, Node::Comment(_))
     }
 
     /// Returns true if node is text.
     pub fn is_text(&self) -> bool {
-        match *self {
-            Node::Text(_) => true,
-            _ => false,
-        }
+        matches!(*self, Node::Text(_))
     }
 
     /// Returns true if node is an element.
     pub fn is_element(&self) -> bool {
-        match *self {
-            Node::Element(_) => true,
-            _ => false,
-        }
+        matches!(*self, Node::Element(_))
     }
 
     /// Returns self as a doctype.
@@ -284,7 +266,7 @@ impl Element {
 
     /// Returns the element ID.
     pub fn id(&self) -> Option<&str> {
-        self.id.as_ref().map(Deref::deref)
+        self.id.as_deref()
     }
 
     /// Returns true if element has the class.

src/selector.rs

@@ -49,7 +49,7 @@ impl Selector {
         context.scope_element = scope.map(|x| selectors::Element::opaque(&x));
         self.selectors
             .iter()
-            .any(|s| matching::matches_selector(&s, 0, None, element, &mut context, &mut |_, _| {}))
+            .any(|s| matching::matches_selector(s, 0, None, element, &mut context, &mut |_, _| {}))
     }
 }