fix ci pipeline

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: cargo deny
         run: |
-          export CARGO_DENY_VERSION="0.13.9"
+          export CARGO_DENY_VERSION="0.16.3"
           export DENY_RELEASE="cargo-deny-${CARGO_DENY_VERSION}-x86_64-unknown-linux-musl"
           wget https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGO_DENY_VERSION}/${DENY_RELEASE}.tar.gz
           wget https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGO_DENY_VERSION}/${DENY_RELEASE}.tar.gz.sha256

deny.toml

@@ -11,6 +11,9 @@
 
 # Root options
 
+# The graph table configures how the dependency graph is constructed and thus
+# which crates the checks are performed against
+[graph]
 # If 1 or more target triples (and optionally, target_features) are specified,
 # only the specified targets will be checked when running `cargo deny check`.
 # This means, if a particular package is only ever used as a target specific
@@ -22,7 +25,7 @@
 targets = [
     # The triple can be any string, but only the target triples built in to
     # rustc (as of 1.40) can be checked against actual config expressions
-    #{ triple = "x86_64-unknown-linux-musl" },
+    #"x86_64-unknown-linux-musl",
     # You can also specify which target_features you promise are enabled for a
     # particular target. target_features are currently not validated against
     # the actual valid features supported by the target architecture.
@@ -46,6 +49,9 @@ no-default-features = false
 # If set, these feature will be enabled when collecting metadata. If `--features`
 # is specified on the cmd line they will take precedence over this option.
 #features = []
+
+# The output table provides options for how/if diagnostics are outputted
+[output]
 # When outputting inclusion graphs in diagnostics that include features, this
 # option can be used to specify the depth at which feature edges will be added.
 # This option is included since the graphs can be quite large and the addition
@@ -57,35 +63,18 @@ feature-depth = 1
 # More documentation for the advisories section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
 [advisories]
-# The path where the advisory database is cloned/fetched into
-db-path = "~/.cargo/advisory-db"
+# The path where the advisory databases are cloned/fetched into
+#db-path = "$CARGO_HOME/advisory-dbs"
 # The url(s) of the advisory databases to use
-db-urls = ["https://github.com/rustsec/advisory-db"]
-# The lint level for security vulnerabilities
-vulnerability = "deny"
-# The lint level for unmaintained crates
-unmaintained = "warn"
-# The lint level for crates that have been yanked from their source registry
-yanked = "deny"
-# The lint level for crates with security notices. Note that as of
-# 2019-12-17 there are no security notice advisories in
-# https://github.com/rustsec/advisory-db
-notice = "warn"
+#db-urls = ["https://github.com/rustsec/advisory-db"]
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
 ignore = [
     #"RUSTSEC-0000-0000",
+    #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
+    #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish
+    #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" },
 ]
-# Threshold for security vulnerabilities, any vulnerability with a CVSS score
-# lower than the range specified will be ignored. Note that ignored advisories
-# will still output a note when they are encountered.
-# * None - CVSS Score 0.0
-# * Low - CVSS Score 0.1 - 3.9
-# * Medium - CVSS Score 4.0 - 6.9
-# * High - CVSS Score 7.0 - 8.9
-# * Critical - CVSS Score 9.0 - 10.0
-#severity-threshold =
-
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.
 # Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support.
@@ -96,8 +85,6 @@ ignore = [
 # More documentation for the licenses section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
 [licenses]
-# The lint level for crates which do not have a detectable license
-unlicensed = "deny"
 # List of explicitly allowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].
@@ -108,29 +95,10 @@ allow = [
     "BSD-3-Clause",
     "ISC",
     "MPL-2.0",
-    "Unicode-DFS-2016",
-    "OpenSSL"
-]
-# List of explicitly disallowed licenses
-# See https://spdx.org/licenses/ for list of possible licenses
-# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
-deny = [
-    #"Nokia",
+    "Unicode-3.0",
+    "OpenSSL",
+#    "Unicode-DFS-2016",
 ]
-# Lint level for licenses considered copyleft
-copyleft = "warn"
-# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
-# * both - The license will be approved if it is both OSI-approved *AND* FSF
-# * either - The license will be approved if it is either OSI-approved *OR* FSF
-# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
-# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
-# * neither - This predicate is ignored and the default lint level is used
-allow-osi-fsf-free = "neither"
-# Lint level used when no other predicates are matched
-# 1. License isn't in the allow or deny lists
-# 2. License isn't copyleft
-# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
-default = "deny"
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the
 # canonical license text of a valid SPDX license file.
@@ -141,19 +109,32 @@ confidence-threshold = 0.8
 exceptions = [
     # Each entry is the crate and version constraint, and its specific allow
     # list
-    #{ allow = ["Zlib"], name = "adler32", version = "*" },
+    #{ allow = ["Zlib"], crate = "adler32" },
 ]
 
 # Some crates don't have (easily) machine readable licensing information,
 # adding a clarification entry for it allows you to manually specify the
 # licensing information
+#[[licenses.clarify]]
+# The package spec the clarification applies to
+#crate = "ring"
+# The SPDX expression for the license requirements of the crate
+#expression = "MIT AND ISC AND OpenSSL"
+# One or more files in the crate's source used as the "source of truth" for
+# the license expression. If the contents match, the clarification will be used
+# when running the license check, otherwise the clarification will be ignored
+# and the crate will be checked normally, which may produce warnings or errors
+# depending on the rest of your configuration
+#license-files = [
+# Each entry is a crate relative path, and the (opaque) hash of its contents
+#{ path = "LICENSE", hash = 0xbd0eed23 }
+#]
+
 [[licenses.clarify]]
-name = "ring"
-#version = "*"
-expression = "MIT AND ISC AND OpenSSL"
+crate = "ring"
+expression = "OpenSSL"
 license-files = [
-    # Each entry is a crate relative path, and the (opaque) hash of its contents
-    { path = "LICENSE", hash = 0xbd0eed23 }
+{ path = "LICENSE", hash = 0xbd0eed23 }
 ]
 
 [licenses.private]
@@ -184,33 +165,32 @@ wildcards = "allow"
 # * all - Both lowest-version and simplest-path are used
 highlight = "all"
 # The default lint level for `default` features for crates that are members of
-# the workspace that is being checked. This can be overriden by allowing/denying
+# the workspace that is being checked. This can be overridden by allowing/denying
 # `default` on a crate-by-crate basis if desired.
 workspace-default-features = "allow"
 # The default lint level for `default` features for external crates that are not
-# members of the workspace. This can be overriden by allowing/denying `default`
+# members of the workspace. This can be overridden by allowing/denying `default`
 # on a crate-by-crate basis if desired.
 external-default-features = "allow"
 # List of crates that are allowed. Use with care!
 allow = [
-    #{ name = "ansi_term", version = "=0.11.0" },
+    #"ansi_term@0.11.0",
+    #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is allowed" },
 ]
 # List of crates to deny
 deny = [
-    # Each entry the name of a crate and a version range. If version is
-    # not specified, all versions will be matched.
-    #{ name = "ansi_term", version = "=0.11.0" },
-    #
+    #"ansi_term@0.11.0",
+    #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is banned" },
     # Wrapper crates can optionally be specified to allow the crate when it
     # is a direct dependency of the otherwise banned crate
-    #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
+    #{ crate = "ansi_term@0.11.0", wrappers = ["this-crate-directly-depends-on-ansi_term"] },
 ]
 
 # List of features to allow/deny
 # Each entry the name of a crate and a version range. If version is
 # not specified, all versions will be matched.
 #[[bans.features]]
-#name = "reqwest"
+#crate = "reqwest"
 # Features to not allow
 #deny = ["json"]
 # Features to allow
@@ -231,14 +211,16 @@ deny = [
 
 # Certain crates/versions that will be skipped when doing duplicate detection.
 skip = [
-    #{ name = "ansi_term", version = "=0.11.0" },
+    #"ansi_term@0.11.0",
+    #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason why it can't be updated/removed" },
 ]
 # Similarly to `skip` allows you to skip certain crates during duplicate
 # detection. Unlike skip, it also includes the entire tree of transitive
 # dependencies starting at the specified crate, up to a certain depth, which is
 # by default infinite.
 skip-tree = [
-    #{ name = "ansi_term", version = "=0.11.0", depth = 20 },
+    #"ansi_term@0.11.0", # will be skipped along with _all_ of its direct and transitive dependencies
+    #{ crate = "ansi_term@0.11.0", depth = 20 },
 ]
 
 # This section is considered when running `cargo deny check sources`.
@@ -258,9 +240,9 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 allow-git = []
 
 [sources.allow-org]
-# 1 or more github.com organizations to allow git sources for
-# github = [""]
-# 1 or more gitlab.com organizations to allow git sources for
-# gitlab = [""]
-# 1 or more bitbucket.org organizations to allow git sources for
-# bitbucket = [""]
+# github.com organizations to allow git sources for
+github = []
+# gitlab.com organizations to allow git sources for
+gitlab = []
+# bitbucket.org organizations to allow git sources for
+bitbucket = []

src/browser.rs

@@ -83,7 +83,7 @@ pub struct Browser {
 
 impl Browser {
     /// Return a [`BrowserBuilder`][BrowserBuilder] to initialize a [`Browser`][Browser] instance.
-    pub fn builder() -> BrowserBuilder {
+    pub const fn builder() -> BrowserBuilder {
         BrowserBuilder::new()
     }
 
@@ -135,6 +135,7 @@ impl Browser {
 }
 
 /// A builder to initialize a [`Browser`][Browser] instance. It allows tweaking advanced settings for the http client.
+///
 /// Refer to the documentation of the public methods to learn about the available settings and their defaults. Use
 /// `finish()` to get the configured [`Browser`][Browser].
 #[derive(Debug)]
@@ -145,8 +146,8 @@ pub struct BrowserBuilder {
 }
 
 impl BrowserBuilder {
-    fn new() -> Self {
-        BrowserBuilder {
+    const fn new() -> Self {
+        Self {
             cookie_store: true,
             skip_tls_verify: false,
             certs: Vec::new(),
@@ -155,7 +156,7 @@ impl BrowserBuilder {
 
     /// Set whether this [`Browser`][Browser] should have a cookie store and therefore handle cookies. Defaults to
     /// `true`.
-    pub fn cookie_store(mut self, cookie_store: bool) -> Self {
+    pub const fn cookie_store(mut self, cookie_store: bool) -> Self {
         self.cookie_store = cookie_store;
         self
     }
@@ -169,7 +170,7 @@ impl BrowserBuilder {
     /// these proxies act as a man-in-the-middle, decrypting the connection to the target web site to scan for viruses
     /// or malware, while re-encrypting the connection to your client with a custom self-signed certificate. In this
     /// particular scenario it may be useful while prototyping to disable verification and simply trust the connection.
-    pub fn skip_tls_verify(mut self, skip_tls_verify: bool) -> Self {
+    pub const fn skip_tls_verify(mut self, skip_tls_verify: bool) -> Self {
         self.skip_tls_verify = skip_tls_verify;
         self
     }
@@ -281,8 +282,8 @@ mod tests {
                     query_list.push_str(&item);
                 }
 
-                let form_action = query.remove("action").or(Some("form".to_owned())).unwrap();
-                let form_method = query.remove("method").or(Some("get".to_owned())).unwrap();
+                let form_action = query.remove("action").unwrap_or("form".to_owned());
+                let form_method = query.remove("method").unwrap_or("get".to_owned());
                 let form = FORM
                     .replace("{FORM_ACTION}", &form_action)
                     .replace("{FORM_METHOD}", &form_method);

src/form.rs

@@ -228,7 +228,7 @@ mod tests {
     fn parse_form() -> Result<()> {
         let html = Html::parse_fragment(FORM_001);
         let selector = Selector::parse("form").unwrap();
-        let form = html.select(&selector).into_iter().next().unwrap();
+        let form = html.select(&selector).next().unwrap();
 
         let form = Form::parse(&form, Url::parse("https://wikipedia.org/").unwrap());
 
@@ -249,7 +249,7 @@ mod tests {
     fn submit_checkboxes() -> Result<()> {
         let html = Html::parse_fragment(FORM_001);
         let selector = Selector::parse("form").unwrap();
-        let form = html.select(&selector).into_iter().next().unwrap();
+        let form = html.select(&selector).next().unwrap();
 
         let mut form = Form::parse(&form, Url::parse("https://wikipedia.org/").unwrap());
 

src/input.rs

@@ -42,7 +42,7 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// The supported html input elements.
 ///
 /// See <https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input>
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum InputType {
     /// see <https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/button> <br/>
     /// See <https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button>
@@ -141,7 +141,7 @@ pub struct Input {
 
 impl Input {
     /// Returns the [`InputType`][InputType] of this input element.
-    pub fn t(&self) -> InputType {
+    pub const fn t(&self) -> InputType {
         self.t
     }
 
@@ -180,7 +180,7 @@ impl Input {
         prev
     }
 
-    pub(crate) fn parse(element: &Element) -> Result<Input> {
+    pub(crate) fn parse(element: &Element) -> Result<Self> {
         let tag_name = element.name().to_lowercase();
 
         match tag_name.as_str() {
@@ -192,7 +192,7 @@ impl Input {
         }
     }
 
-    fn parse_input(element: &Element) -> Result<Input> {
+    fn parse_input(element: &Element) -> Result<Self> {
         let t = element
             .attr("type")
             .ok_or_else(|| Error::MissingAttributeError {
@@ -210,7 +210,7 @@ impl Input {
         Self::parse_element(element, t)
     }
 
-    fn parse_button(element: &Element) -> Result<Input> {
+    fn parse_button(element: &Element) -> Result<Self> {
         let t = element.attr("type").unwrap_or("submit").to_lowercase();
 
         let t = match t.as_str() {
@@ -223,7 +223,7 @@ impl Input {
         Self::parse_element(element, t)
     }
 
-    fn parse_element(element: &Element, t: InputType) -> Result<Input> {
+    fn parse_element(element: &Element, t: InputType) -> Result<Self> {
         let name = element
             .attr("name")
             .ok_or(Error::UnnamedInputError {})?
@@ -235,7 +235,7 @@ impl Input {
             attr.insert(k.to_owned(), v.to_owned());
         }
 
-        Ok(Input {
+        Ok(Self {
             t,
             name,
             value,

src/lib.rs

@@ -42,7 +42,7 @@
 //!
 //! // the main page should welcome us
 //! assert!(page
-//!     .select_first("h1 > span.mw-headline")?
+//!     .select_first("div.mw-heading > h1")?
 //!     .inner_html()
 //!     .starts_with("Welcome to"));
 //!