From 3d0ef37a7ac22cdd32c3f5c324c90f146f221e92 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 10:00:54 +0100
Subject: [PATCH 1/8] Exclude dev-dependencies from MSRV CI

---
 .github/workflows/main.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e9c179d..4c36583 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: ["1.66.0", "stable", "beta"]
+        rust: ["stable", "beta"]
         build_flags: ["", "--cfg ammonia_unstable"]
         os: [ubuntu-latest]
     steps:
@@ -28,11 +28,29 @@ jobs:
         env:
           RUSTFLAGS: ${{ matrix.build_flags }}
 
+  msrv:
+    name: MSRV
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        build_flags: ["", "--cfg ammonia_unstable"]
+    steps:
+      - uses: actions/checkout@master
+      - name: Set toolchain
+        run: |
+          rustup set profile minimal
+          rustup override set 1.66.0
+      - name: Check
+        run: cargo check --lib --all-features
+        env:
+          RUSTFLAGS: ${{ matrix.build_flags }}
+
   ci-success:
     name: ci
     if: ${{ success() }}
     needs:
       - test
+      - msrv
     runs-on: ubuntu-latest
     steps:
       - name: CI succeeded

From 893585431e5f6f375cdfc802826fbdeadd0b9efc Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 10:08:41 +0100
Subject: [PATCH 2/8] Test MSRV at 1.60

---
 .github/workflows/main.yml | 2 +-
 README.md                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c36583..800fe1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Set toolchain
         run: |
           rustup set profile minimal
-          rustup override set 1.66.0
+          rustup override set 1.60.0
       - name: Check
         run: cargo check --lib --all-features
         env:
diff --git a/README.md b/README.md
index 212cbeb..c773dbb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ HTML Sanitization
 =================
 
 [![Crates.IO](https://img.shields.io/crates/v/ammonia.svg)](https://crates.io/crates/ammonia)
-![Requires rustc 1.60.0](https://img.shields.io/badge/rustc-1.66.0+-green.svg)
+![Requires rustc 1.60.0](https://img.shields.io/badge/rustc-1.60.0+-green.svg)
 
 Ammonia is a whitelist-based HTML sanitization library. It is designed to
 prevent cross-site scripting, layout breaking, and clickjacking caused

From 9957d80c1b97e67f8d60453ab11fc35b15be8261 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 09:57:31 +0100
Subject: [PATCH 3/8] Make MSRV explicit in Cargo metadata

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index b981a4c..ae59f90 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ documentation = "https://docs.rs/ammonia/"
 repository = "https://github.com/rust-ammonia/ammonia"
 categories = [ "web-programming", "text-processing" ]
 edition = "2018"
+rust-version = "1.60"
 
 [dependencies]
 html5ever = "0.26"

From 4619898554477c1ec5e29a3ed07ae65bea21b8f6 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 09:56:28 +0100
Subject: [PATCH 4/8] Update html5ever to 0.27

---
 Cargo.toml | 2 +-
 src/lib.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ae59f90..a4ba041 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 rust-version = "1.60"
 
 [dependencies]
-html5ever = "0.26"
+html5ever = "0.27"
 maplit = "1.0"
 tendril = "0.4"
 url = "2"
diff --git a/src/lib.rs b/src/lib.rs
index b631071..ab277f7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -177,7 +177,7 @@ pub fn is_html(input: &str) -> bool {
     let santok = SanitizationTokenizer::new();
     let mut chunk = ByteTendril::new();
     chunk.push_slice(input.as_bytes());
-    let mut input = BufferQueue::new();
+    let mut input = BufferQueue::default();
     input.push_back(chunk.try_reinterpret().unwrap());
 
     let mut tok = Tokenizer::new(santok, Default::default());

From a90f4003e1078c099b3366d0cb58a6d6e6f1827d Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 10:11:07 +0100
Subject: [PATCH 5/8] Add comment about env_logger update

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index a4ba041..e44bb03 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,4 +21,4 @@ once_cell = "1.10"
 
 [dev-dependencies]
 version-sync = "0.9"
-env_logger = "0.10"
+env_logger = "0.10" # env_logger 0.11 requires MSRV 1.70 even for a dev-dep due to Cargo metadata

From c30043d7cdbb7375a9f3975eaca1907062ea91c3 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 10:14:44 +0100
Subject: [PATCH 6/8] Update to 2021 edition

---
 Cargo.toml |  2 +-
 src/lib.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e44bb03..4ba171a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 documentation = "https://docs.rs/ammonia/"
 repository = "https://github.com/rust-ammonia/ammonia"
 categories = [ "web-programming", "text-processing" ]
-edition = "2018"
+edition = "2021"
 rust-version = "1.60"
 
 [dependencies]
diff --git a/src/lib.rs b/src/lib.rs
index ab277f7..2de5838 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1658,7 +1658,7 @@ impl<'a> Builder<'a> {
     ///     use ammonia::{Builder, Url, UrlRelative};
     ///     # use std::error::Error;
     ///
-    ///     # fn do_main() -> Result<(), Box<Error>> {
+    ///     # fn do_main() -> Result<(), Box<dyn Error>> {
     ///     let input = "<!-- comments will be stripped -->This is an <a href=.>Ammonia</a> example using <a href=struct.Builder.html#method.new onclick=xss>the <code onmouseover=xss>new()</code> function</a>.";
     ///     let output = "This is an <a href=\"https://docs.rs/ammonia/1.0/ammonia/\" rel=\"noopener noreferrer\">Ammonia</a> example using <a href=\"https://docs.rs/ammonia/1.0/ammonia/struct.Builder.html#method.new\" rel=\"noopener noreferrer\">the <code>new()</code> function</a>.";
     ///
@@ -1684,7 +1684,7 @@ impl<'a> Builder<'a> {
     ///     use ammonia::{Builder, Url, UrlRelative};
     ///     # use std::error::Error;
     ///
-    ///     # fn do_main() -> Result<(), Box<Error>> {
+    ///     # fn do_main() -> Result<(), Box<dyn Error>> {
     ///     let input = "<!-- comments will be stripped -->This is an <a href=.>Ammonia</a> example using <a href=struct.Builder.html#method.new onclick=xss>the <code onmouseover=xss>empty()</code> function</a>.";
     ///     let output = "This is an Ammonia example using the empty() function.";
     ///
@@ -1713,7 +1713,7 @@ impl<'a> Builder<'a> {
     ///     use ammonia::{Builder, Url, UrlRelative};
     ///     # use std::error::Error;
     ///
-    ///     # fn do_main() -> Result<(), Box<Error>> {
+    ///     # fn do_main() -> Result<(), Box<dyn Error>> {
     ///     let input = "<!-- comments will be stripped -->This is an <a href=.>Ammonia</a> example using <a href=struct.Builder.html#method.new onclick=xss>the <code onmouseover=xss>new()</code> function</a>.";
     ///     let output = "This is an <a href=\"https://docs.rs/ammonia/1.0/ammonia/\" rel=\"noopener noreferrer\">Ammonia</a> example using <a href=\"https://docs.rs/ammonia/1.0/ammonia/struct.Builder.html#method.new\" rel=\"noopener noreferrer\">the <code>new()</code> function</a>.";
     ///
@@ -1743,7 +1743,7 @@ impl<'a> Builder<'a> {
     ///     use ammonia::Builder;
     ///     # use std::error::Error;
     ///
-    ///     # fn do_main() -> Result<(), Box<Error>> {
+    ///     # fn do_main() -> Result<(), Box<dyn Error>> {
     ///     let a = Builder::new()
     ///         .clean_from_reader(&b"<!-- no -->"[..])? // notice the `b`
     ///         .to_string();
@@ -2817,7 +2817,7 @@ impl Document {
     ///     use html5ever::serialize::{serialize, SerializeOpts};
     ///
     ///     # use std::error::Error;
-    ///     # fn do_main() -> Result<(), Box<Error>> {
+    ///     # fn do_main() -> Result<(), Box<dyn Error>> {
     ///     let input = "<a>one link</a> and <a>one more</a>";
     ///     let expected = "<a>one more</a> and <a>one link</a>";
     ///

From 2412f833dd84c79add4eaf2cec8ae5639d5caffe Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 10:16:34 +0100
Subject: [PATCH 7/8] Fix formatting with cargo fmt

---
 src/lib.rs   | 557 ++++++++++++++++++++++++++-------------------------
 src/rcdom.rs |  37 ++--
 2 files changed, 305 insertions(+), 289 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 2de5838..48e78f9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,7 +27,6 @@
 //! [html5ever]: https://github.com/servo/html5ever "The HTML parser in Servo"
 //! [pulldown-cmark]: https://github.com/google/pulldown-cmark "CommonMark parser"
 
-
 #[cfg(ammonia_unstable)]
 pub mod rcdom;
 
@@ -2189,271 +2188,271 @@ fn is_svg_tag(element: &str) -> bool {
     // https://svgwg.org/svg2-draft/eltindex.html
     matches!(
         element,
-        "a"
-        | "animate"
-        | "animateMotion"
-        | "animateTransform"
-        | "circle"
-        | "clipPath"
-        | "defs"
-        | "desc"
-        | "discard"
-        | "ellipse"
-        | "feBlend"
-        | "feColorMatrix"
-        | "feComponentTransfer"
-        | "feComposite"
-        | "feConvolveMatrix"
-        | "feDiffuseLighting"
-        | "feDisplacementMap"
-        | "feDistantLight"
-        | "feDropShadow"
-        | "feFlood"
-        | "feFuncA"
-        | "feFuncB"
-        | "feFuncG"
-        | "feFuncR"
-        | "feGaussianBlur"
-        | "feImage"
-        | "feMerge"
-        | "feMergeNode"
-        | "feMorphology"
-        | "feOffset"
-        | "fePointLight"
-        | "feSpecularLighting"
-        | "feSpotLight"
-        | "feTile"
-        | "feTurbulence"
-        | "filter"
-        | "foreignObject"
-        | "g"
-        | "image"
-        | "line"
-        | "linearGradient"
-        | "marker"
-        | "mask"
-        | "metadata"
-        | "mpath"
-        | "path"
-        | "pattern"
-        | "polygon"
-        | "polyline"
-        | "radialGradient"
-        | "rect"
-        | "script"
-        | "set"
-        | "stop"
-        | "style"
-        | "svg"
-        | "switch"
-        | "symbol"
-        | "text"
-        | "textPath"
-        | "title"
-        | "tspan"
-        | "use"
-        | "view"
+        "a" | "animate"
+            | "animateMotion"
+            | "animateTransform"
+            | "circle"
+            | "clipPath"
+            | "defs"
+            | "desc"
+            | "discard"
+            | "ellipse"
+            | "feBlend"
+            | "feColorMatrix"
+            | "feComponentTransfer"
+            | "feComposite"
+            | "feConvolveMatrix"
+            | "feDiffuseLighting"
+            | "feDisplacementMap"
+            | "feDistantLight"
+            | "feDropShadow"
+            | "feFlood"
+            | "feFuncA"
+            | "feFuncB"
+            | "feFuncG"
+            | "feFuncR"
+            | "feGaussianBlur"
+            | "feImage"
+            | "feMerge"
+            | "feMergeNode"
+            | "feMorphology"
+            | "feOffset"
+            | "fePointLight"
+            | "feSpecularLighting"
+            | "feSpotLight"
+            | "feTile"
+            | "feTurbulence"
+            | "filter"
+            | "foreignObject"
+            | "g"
+            | "image"
+            | "line"
+            | "linearGradient"
+            | "marker"
+            | "mask"
+            | "metadata"
+            | "mpath"
+            | "path"
+            | "pattern"
+            | "polygon"
+            | "polyline"
+            | "radialGradient"
+            | "rect"
+            | "script"
+            | "set"
+            | "stop"
+            | "style"
+            | "svg"
+            | "switch"
+            | "symbol"
+            | "text"
+            | "textPath"
+            | "title"
+            | "tspan"
+            | "use"
+            | "view"
     )
 }
 
 /// Given an element name, check if it's Math
 fn is_mathml_tag(element: &str) -> bool {
     // https://svgwg.org/svg2-draft/eltindex.html
-    matches!(element,
+    matches!(
+        element,
         "abs"
-        | "and"
-        | "annotation"
-        | "annotation-xml"
-        | "apply"
-        | "approx"
-        | "arccos"
-        | "arccosh"
-        | "arccot"
-        | "arccoth"
-        | "arccsc"
-        | "arccsch"
-        | "arcsec"
-        | "arcsech"
-        | "arcsin"
-        | "arcsinh"
-        | "arctan"
-        | "arctanh"
-        | "arg"
-        | "bind"
-        | "bvar"
-        | "card"
-        | "cartesianproduct"
-        | "cbytes"
-        | "ceiling"
-        | "cerror"
-        | "ci"
-        | "cn"
-        | "codomain"
-        | "complexes"
-        | "compose"
-        | "condition"
-        | "conjugate"
-        | "cos"
-        | "cosh"
-        | "cot"
-        | "coth"
-        | "cs"
-        | "csc"
-        | "csch"
-        | "csymbol"
-        | "curl"
-        | "declare"
-        | "degree"
-        | "determinant"
-        | "diff"
-        | "divergence"
-        | "divide"
-        | "domain"
-        | "domainofapplication"
-        | "emptyset"
-        | "eq"
-        | "equivalent"
-        | "eulergamma"
-        | "exists"
-        | "exp"
-        | "exponentiale"
-        | "factorial"
-        | "factorof"
-        | "false"
-        | "floor"
-        | "fn"
-        | "forall"
-        | "gcd"
-        | "geq"
-        | "grad"
-        | "gt"
-        | "ident"
-        | "image"
-        | "imaginary"
-        | "imaginaryi"
-        | "implies"
-        | "in"
-        | "infinity"
-        | "int"
-        | "integers"
-        | "intersect"
-        | "interval"
-        | "inverse"
-        | "lambda"
-        | "laplacian"
-        | "lcm"
-        | "leq"
-        | "limit"
-        | "list"
-        | "ln"
-        | "log"
-        | "logbase"
-        | "lowlimit"
-        | "lt"
-        | "maction"
-        | "maligngroup"
-        | "malignmark"
-        | "math"
-        | "matrix"
-        | "matrixrow"
-        | "max"
-        | "mean"
-        | "median"
-        | "menclose"
-        | "merror"
-        | "mfenced"
-        | "mfrac"
-        | "mglyph"
-        | "mi"
-        | "min"
-        | "minus"
-        | "mlabeledtr"
-        | "mlongdiv"
-        | "mmultiscripts"
-        | "mn"
-        | "mo"
-        | "mode"
-        | "moment"
-        | "momentabout"
-        | "mover"
-        | "mpadded"
-        | "mphantom"
-        | "mprescripts"
-        | "mroot"
-        | "mrow"
-        | "ms"
-        | "mscarries"
-        | "mscarry"
-        | "msgroup"
-        | "msline"
-        | "mspace"
-        | "msqrt"
-        | "msrow"
-        | "mstack"
-        | "mstyle"
-        | "msub"
-        | "msubsup"
-        | "msup"
-        | "mtable"
-        | "mtd"
-        | "mtext"
-        | "mtr"
-        | "munder"
-        | "munderover"
-        | "naturalnumbers"
-        | "neq"
-        | "none"
-        | "not"
-        | "notanumber"
-        | "notin"
-        | "notprsubset"
-        | "notsubset"
-        | "or"
-        | "otherwise"
-        | "outerproduct"
-        | "partialdiff"
-        | "pi"
-        | "piece"
-        | "piecewise"
-        | "plus"
-        | "power"
-        | "primes"
-        | "product"
-        | "prsubset"
-        | "quotient"
-        | "rationals"
-        | "real"
-        | "reals"
-        | "reln"
-        | "rem"
-        | "root"
-        | "scalarproduct"
-        | "sdev"
-        | "sec"
-        | "sech"
-        | "selector"
-        | "semantics"
-        | "sep"
-        | "set"
-        | "setdiff"
-        | "share"
-        | "sin"
-        | "sinh"
-        | "span"
-        | "subset"
-        | "sum"
-        | "tan"
-        | "tanh"
-        | "tendsto"
-        | "times"
-        | "transpose"
-        | "true"
-        | "union"
-        | "uplimit"
-        | "variance"
-        | "vector"
-        | "vectorproduct"
-        | "xor"
+            | "and"
+            | "annotation"
+            | "annotation-xml"
+            | "apply"
+            | "approx"
+            | "arccos"
+            | "arccosh"
+            | "arccot"
+            | "arccoth"
+            | "arccsc"
+            | "arccsch"
+            | "arcsec"
+            | "arcsech"
+            | "arcsin"
+            | "arcsinh"
+            | "arctan"
+            | "arctanh"
+            | "arg"
+            | "bind"
+            | "bvar"
+            | "card"
+            | "cartesianproduct"
+            | "cbytes"
+            | "ceiling"
+            | "cerror"
+            | "ci"
+            | "cn"
+            | "codomain"
+            | "complexes"
+            | "compose"
+            | "condition"
+            | "conjugate"
+            | "cos"
+            | "cosh"
+            | "cot"
+            | "coth"
+            | "cs"
+            | "csc"
+            | "csch"
+            | "csymbol"
+            | "curl"
+            | "declare"
+            | "degree"
+            | "determinant"
+            | "diff"
+            | "divergence"
+            | "divide"
+            | "domain"
+            | "domainofapplication"
+            | "emptyset"
+            | "eq"
+            | "equivalent"
+            | "eulergamma"
+            | "exists"
+            | "exp"
+            | "exponentiale"
+            | "factorial"
+            | "factorof"
+            | "false"
+            | "floor"
+            | "fn"
+            | "forall"
+            | "gcd"
+            | "geq"
+            | "grad"
+            | "gt"
+            | "ident"
+            | "image"
+            | "imaginary"
+            | "imaginaryi"
+            | "implies"
+            | "in"
+            | "infinity"
+            | "int"
+            | "integers"
+            | "intersect"
+            | "interval"
+            | "inverse"
+            | "lambda"
+            | "laplacian"
+            | "lcm"
+            | "leq"
+            | "limit"
+            | "list"
+            | "ln"
+            | "log"
+            | "logbase"
+            | "lowlimit"
+            | "lt"
+            | "maction"
+            | "maligngroup"
+            | "malignmark"
+            | "math"
+            | "matrix"
+            | "matrixrow"
+            | "max"
+            | "mean"
+            | "median"
+            | "menclose"
+            | "merror"
+            | "mfenced"
+            | "mfrac"
+            | "mglyph"
+            | "mi"
+            | "min"
+            | "minus"
+            | "mlabeledtr"
+            | "mlongdiv"
+            | "mmultiscripts"
+            | "mn"
+            | "mo"
+            | "mode"
+            | "moment"
+            | "momentabout"
+            | "mover"
+            | "mpadded"
+            | "mphantom"
+            | "mprescripts"
+            | "mroot"
+            | "mrow"
+            | "ms"
+            | "mscarries"
+            | "mscarry"
+            | "msgroup"
+            | "msline"
+            | "mspace"
+            | "msqrt"
+            | "msrow"
+            | "mstack"
+            | "mstyle"
+            | "msub"
+            | "msubsup"
+            | "msup"
+            | "mtable"
+            | "mtd"
+            | "mtext"
+            | "mtr"
+            | "munder"
+            | "munderover"
+            | "naturalnumbers"
+            | "neq"
+            | "none"
+            | "not"
+            | "notanumber"
+            | "notin"
+            | "notprsubset"
+            | "notsubset"
+            | "or"
+            | "otherwise"
+            | "outerproduct"
+            | "partialdiff"
+            | "pi"
+            | "piece"
+            | "piecewise"
+            | "plus"
+            | "power"
+            | "primes"
+            | "product"
+            | "prsubset"
+            | "quotient"
+            | "rationals"
+            | "real"
+            | "reals"
+            | "reln"
+            | "rem"
+            | "root"
+            | "scalarproduct"
+            | "sdev"
+            | "sec"
+            | "sech"
+            | "selector"
+            | "semantics"
+            | "sep"
+            | "set"
+            | "setdiff"
+            | "share"
+            | "sin"
+            | "sinh"
+            | "span"
+            | "subset"
+            | "sum"
+            | "tan"
+            | "tanh"
+            | "tendsto"
+            | "times"
+            | "transpose"
+            | "true"
+            | "union"
+            | "uplimit"
+            | "variance"
+            | "vector"
+            | "vectorproduct"
+            | "xor"
     )
 }
 
@@ -2631,9 +2630,10 @@ pub enum UrlRelative<'a> {
 impl<'a> UrlRelative<'a> {
     fn evaluate(&self, url: &str) -> Option<tendril::StrTendril> {
         match self {
-            UrlRelative::RewriteWithBase(ref url_base) => {
-                url_base.join(url).ok().and_then(|x| StrTendril::from_str(x.as_str()).ok())
-            }
+            UrlRelative::RewriteWithBase(ref url_base) => url_base
+                .join(url)
+                .ok()
+                .and_then(|x| StrTendril::from_str(x.as_str()).ok()),
             UrlRelative::RewriteWithRoot { ref root, ref path } => {
                 (match url.as_bytes() {
                     // Scheme-relative URL
@@ -2643,16 +2643,16 @@ impl<'a> UrlRelative<'a> {
                     [b'/', ..] => root.join(&url[1..]),
                     // Path-relative URL
                     _ => root.join(path).and_then(|r| r.join(url)),
-                }).ok().and_then(|x| StrTendril::from_str(x.as_str()).ok())
-            }
-            UrlRelative::Custom(ref evaluate) => {
-                evaluate
-                    .evaluate(&*url)
-                    .as_ref()
-                    .map(Cow::as_ref)
-                    .map(StrTendril::from_str)
-                    .and_then(Result::ok)
+                })
+                .ok()
+                .and_then(|x| StrTendril::from_str(x.as_str()).ok())
             }
+            UrlRelative::Custom(ref evaluate) => evaluate
+                .evaluate(&*url)
+                .as_ref()
+                .map(Cow::as_ref)
+                .map(StrTendril::from_str)
+                .and_then(Result::ok),
             UrlRelative::PassThrough => StrTendril::from_str(url).ok(),
             UrlRelative::Deny => None,
         }
@@ -2668,7 +2668,10 @@ impl<'a> fmt::Debug for UrlRelative<'a> {
                 write!(f, "UrlRelative::RewriteWithBase({})", base)
             }
             UrlRelative::RewriteWithRoot { ref root, ref path } => {
-                write!(f, "UrlRelative::RewriteWithRoot {{ root: {root}, path: {path} }}")
+                write!(
+                    f,
+                    "UrlRelative::RewriteWithRoot {{ root: {root}, path: {path} }}"
+                )
             }
             UrlRelative::Custom(_) => write!(f, "UrlRelative::Custom"),
         }
@@ -3810,11 +3813,17 @@ mod test {
             let h = format!(r#"<a href="{url}">test</a>"#);
             let r = format!(r#"<a href="{result}" rel="noopener noreferrer">test</a>"#);
             let a = Builder::new()
-                .url_relative(UrlRelative::RewriteWithRoot { root: Url::parse(root).unwrap(), path: path.to_string() })
+                .url_relative(UrlRelative::RewriteWithRoot {
+                    root: Url::parse(root).unwrap(),
+                    path: path.to_string(),
+                })
                 .clean(&h)
                 .to_string();
             if r != a {
-                println!("failed to check ({root}, {path}, {url}, {result})\n{r} != {a}", r = r);
+                println!(
+                    "failed to check ({root}, {path}, {url}, {result})\n{r} != {a}",
+                    r = r
+                );
                 assert_eq!(r, a);
             }
         }
diff --git a/src/rcdom.rs b/src/rcdom.rs
index bd74253..67cbf4b 100644
--- a/src/rcdom.rs
+++ b/src/rcdom.rs
@@ -130,7 +130,11 @@ impl Drop for Node {
         while let Some(node) = nodes.pop() {
             let children = mem::take(&mut *node.children.borrow_mut());
             nodes.extend(children.into_iter());
-            if let NodeData::Element { ref template_contents, .. } = node.data {
+            if let NodeData::Element {
+                ref template_contents,
+                ..
+            } = node.data
+            {
                 if let Some(template_contents) = template_contents.borrow_mut().take() {
                     nodes.push(template_contents);
                 }
@@ -188,7 +192,7 @@ fn append_to_existing_text(prev: &Handle, text: &str) -> bool {
         NodeData::Text { ref contents } => {
             contents.borrow_mut().push_slice(text);
             true
-        },
+        }
         _ => false,
     }
 }
@@ -234,7 +238,11 @@ impl TreeSink for RcDom {
             ..
         } = target.data
         {
-            template_contents.borrow().as_ref().expect("not a template element!").clone()
+            template_contents
+                .borrow()
+                .as_ref()
+                .expect("not a template element!")
+                .clone()
         } else {
             panic!("not a template element!")
         }
@@ -325,7 +333,7 @@ impl TreeSink for RcDom {
                 Node::new(NodeData::Text {
                     contents: RefCell::new(text),
                 })
-            },
+            }
 
             // The tree builder promises we won't have a text node after
             // the insertion point.
@@ -452,12 +460,13 @@ impl Serialize for SerializableHandle {
         let mut ops = VecDeque::new();
         match traversal_scope {
             IncludeNode => ops.push_back(SerializeOp::Open(self.0.clone())),
-            ChildrenOnly(_) => ops.extend(self
-                .0
-                .children
-                .borrow()
-                .iter()
-                .map(|h| SerializeOp::Open(h.clone())))
+            ChildrenOnly(_) => ops.extend(
+                self.0
+                    .children
+                    .borrow()
+                    .iter()
+                    .map(|h| SerializeOp::Open(h.clone())),
+            ),
         }
 
         while let Some(op) = ops.pop_front() {
@@ -479,13 +488,11 @@ impl Serialize for SerializableHandle {
                         for child in handle.children.borrow().iter().rev() {
                             ops.push_front(SerializeOp::Open(child.clone()));
                         }
-                    },
+                    }
 
                     NodeData::Doctype { ref name, .. } => serializer.write_doctype(name)?,
 
-                    NodeData::Text { ref contents } => {
-                        serializer.write_text(&contents.borrow())?
-                    },
+                    NodeData::Text { ref contents } => serializer.write_text(&contents.borrow())?,
 
                     NodeData::Comment { ref contents } => serializer.write_comment(contents)?,
 
@@ -499,7 +506,7 @@ impl Serialize for SerializableHandle {
 
                 SerializeOp::Close(name) => {
                     serializer.end_elem(name)?;
-                },
+                }
             }
         }
 

From 6228bda8574561efb7da56de62d788fef9375c41 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 25 Mar 2024 10:17:25 +0100
Subject: [PATCH 8/8] Apply clippy suggestions

---
 src/lib.rs | 54 ++++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 48e78f9..290f1f0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -756,7 +756,7 @@ impl<'a> Builder<'a> {
     ) -> &mut Self {
         self.tag_attributes
             .entry(tag.borrow())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .extend(it.into_iter().map(Borrow::borrow));
         self
     }
@@ -864,9 +864,9 @@ impl<'a> Builder<'a> {
     ) -> &mut Self {
         self.tag_attribute_values
             .entry(tag.borrow())
-            .or_insert_with(HashMap::new)
+            .or_default()
             .entry(attribute.borrow())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .extend(it.into_iter().map(Borrow::borrow));
 
         self
@@ -989,7 +989,7 @@ impl<'a> Builder<'a> {
     ) -> &mut Self {
         self.set_tag_attribute_values
             .entry(tag.borrow())
-            .or_insert_with(HashMap::new)
+            .or_default()
             .insert(attribute.borrow(), value.borrow());
         self
     }
@@ -1535,7 +1535,7 @@ impl<'a> Builder<'a> {
     ) -> &mut Self {
         self.allowed_classes
             .entry(tag.borrow())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .extend(it.into_iter().map(Borrow::borrow));
         self
     }
@@ -1896,8 +1896,8 @@ impl<'a> Builder<'a> {
                             // Banned classes will be filtered later.
                             &*attr.name.local == "class"
                                 && self.allowed_classes.contains_key(&*name.local)
-                        } else if is_url_attr(&*name.local, &*attr.name.local) {
-                            let url = Url::parse(&*attr.value);
+                        } else if is_url_attr(&name.local, &attr.name.local) {
+                            let url = Url::parse(&attr.value);
                             if let Ok(url) = url {
                                 self.url_schemes.contains(url.scheme())
                             } else if url == Err(url::ParseError::RelativeUrlWithoutBase) {
@@ -2026,11 +2026,11 @@ impl<'a> Builder<'a> {
             // https://html.spec.whatwg.org/#svg-0
             matches!(&*parent.local, "foreignObject")
         } else if child.ns == ns!(svg) {
-            is_svg_tag(&*child.local)
+            is_svg_tag(&child.local)
         } else if child.ns == ns!(mathml) {
-            is_mathml_tag(&*child.local)
+            is_mathml_tag(&child.local)
         } else if child.ns == ns!(html) {
-            (!is_svg_tag(&*child.local) && !is_mathml_tag(&*child.local))
+            (!is_svg_tag(&child.local) && !is_mathml_tag(&child.local))
                 || matches!(
                     &*child.local,
                     "title" | "style" | "font" | "a" | "script" | "span"
@@ -2099,7 +2099,7 @@ impl<'a> Builder<'a> {
                 let mut attrs = attrs.borrow_mut();
                 for (i, attr) in &mut attrs.iter_mut().enumerate() {
                     let replace_with = if let Some(new) =
-                        attr_filter.filter(&*name.local, &*attr.name.local, &*attr.value)
+                        attr_filter.filter(&name.local, &attr.name.local, &attr.value)
                     {
                         if *new != *attr.value {
                             Some(format_tendril!("{}", new))
@@ -2122,9 +2122,8 @@ impl<'a> Builder<'a> {
                 let mut drop_attrs = Vec::new();
                 let mut attrs = attrs.borrow_mut();
                 for (i, attr) in attrs.iter_mut().enumerate() {
-                    if is_url_attr(&*name.local, &*attr.name.local) && is_url_relative(&*attr.value)
-                    {
-                        let new_value = self.url_relative.evaluate(&*attr.value);
+                    if is_url_attr(&name.local, &attr.name.local) && is_url_relative(&attr.value) {
+                        let new_value = self.url_relative.evaluate(&attr.value);
                         if let Some(new_value) = new_value {
                             attr.value = new_value;
                         } else {
@@ -2648,7 +2647,7 @@ impl<'a> UrlRelative<'a> {
                 .and_then(|x| StrTendril::from_str(x.as_str()).ok())
             }
             UrlRelative::Custom(ref evaluate) => evaluate
-                .evaluate(&*url)
+                .evaluate(url)
                 .as_ref()
                 .map(Cow::as_ref)
                 .map(StrTendril::from_str)
@@ -2891,7 +2890,7 @@ impl Display for Document {
 
 impl fmt::Debug for Document {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Document({})", self.to_string())
+        write!(f, "Document({})", self)
     }
 }
 
@@ -3002,11 +3001,10 @@ mod test {
             .attribute_filter(|elem, attr, value| {
                 assert_eq!("a", elem);
                 assert!(
-                    match (attr, value) {
-                        ("href", "test") => true,
-                        ("rel", "noopener noreferrer") => true,
-                        _ => false,
-                    },
+                    matches!(
+                        (attr, value),
+                        ("href", "test") | ("rel", "noopener noreferrer")
+                    ),
                     "{}",
                     value.to_string()
                 );
@@ -3379,11 +3377,11 @@ mod test {
             let u = url.as_bytes();
             // `//a/b/c` is "protocol-relative", meaning "a" is a hostname
             // `/a/b/c` is an absolute path, and what we want to do stuff to.
-            u.get(0) == Some(&b'/') && u.get(1) != Some(&b'/')
+            u.first() == Some(&b'/') && u.get(1) != Some(&b'/')
         }
         fn is_banned(url: &str) -> bool {
             let u = url.as_bytes();
-            u.get(0) == Some(&b'b') && u.get(1) == Some(&b'a')
+            u.first() == Some(&b'b') && u.get(1) == Some(&b'a')
         }
         fn evaluate(url: &str) -> Option<Cow<'_, str>> {
             if is_absolute_path(url) {
@@ -3406,11 +3404,11 @@ mod test {
             let u = url.as_bytes();
             // `//a/b/c` is "protocol-relative", meaning "a" is a hostname
             // `/a/b/c` is an absolute path, and what we want to do stuff to.
-            u.get(0) == Some(&b'/') && u.get(1) != Some(&b'/')
+            u.first() == Some(&b'/') && u.get(1) != Some(&b'/')
         }
         fn is_banned(url: &str) -> bool {
             let u = url.as_bytes();
-            u.get(0) == Some(&b'b') && u.get(1) == Some(&b'a')
+            u.first() == Some(&b'b') && u.get(1) == Some(&b'a')
         }
         fn evaluate(url: &str) -> Option<Cow<'_, str>> {
             if is_absolute_path(url) {
@@ -3647,9 +3645,9 @@ mod test {
         let mut b = Builder::new();
         let mut hs: HashSet<&'_ str> = HashSet::new();
         hs.insert("data-");
-        assert_eq!(b.generic_attribute_prefixes.is_none(), true);
+        assert!(b.generic_attribute_prefixes.is_none());
         b.generic_attribute_prefixes(hs);
-        assert_eq!(b.generic_attribute_prefixes.is_some(), true);
+        assert!(b.generic_attribute_prefixes.is_some());
         assert_eq!(b.generic_attribute_prefixes.as_ref().unwrap().len(), 1);
         b.add_generic_attribute_prefixes(&prefix_data);
         assert_eq!(b.generic_attribute_prefixes.as_ref().unwrap().len(), 1);
@@ -3660,7 +3658,7 @@ mod test {
         b.rm_generic_attribute_prefixes(&prefix_code);
         assert_eq!(b.generic_attribute_prefixes.as_ref().unwrap().len(), 1);
         b.rm_generic_attribute_prefixes(&prefix_data);
-        assert_eq!(b.generic_attribute_prefixes.is_none(), true);
+        assert!(b.generic_attribute_prefixes.is_none());
     }
 
     #[test]