html-to-markdown 2.23.4 → 2.24.1

data/rust-vendor/proc-macro2/src/fallback.rs

@@ -375,38 +375,52 @@ impl FileInfo {
     }
 
     fn byte_range(&mut self, span: Span) -> Range<usize> {
-        let lo_char = (span.lo - self.span.lo) as usize;
+        self.byte(span.lo)..self.byte(span.hi)
+    }
+
+    fn byte(&mut self, ch: u32) -> usize {
+        let char_index = (ch - self.span.lo) as usize;
 
         // Look up offset of the largest already-computed char index that is
-        // less than or equal to the current requested one. We resume counting
-        // chars from that point.
-        let (&last_char_index, &last_byte_offset) = self
+        // less than or equal to the current requested one.
+        let (&previous_char_index, &previous_byte_offset) = self
             .char_index_to_byte_offset
-            .range(..=lo_char)
+            .range(..=char_index)
             .next_back()
             .unwrap_or((&0, &0));
 
-        let lo_byte = if last_char_index == lo_char {
-            last_byte_offset
-        } else {
-            let total_byte_offset = match self.source_text[last_byte_offset..]
-                .char_indices()
-                .nth(lo_char - last_char_index)
+        if previous_char_index == char_index {
+            return previous_byte_offset;
+        }
+
+        // Look up next char index that is greater than the requested one. We
+        // resume counting chars from whichever point is closer.
+        let byte_offset = match self.char_index_to_byte_offset.range(char_index..).next() {
+            Some((&next_char_index, &next_byte_offset))
+                if next_char_index - char_index < char_index - previous_char_index =>
             {
-                Some((additional_offset, _ch)) => last_byte_offset + additional_offset,
-                None => self.source_text.len(),
-            };
-            self.char_index_to_byte_offset
-                .insert(lo_char, total_byte_offset);
-            total_byte_offset
+                self.source_text[..next_byte_offset]
+                    .char_indices()
+                    .nth_back(next_char_index - char_index - 1)
+                    .unwrap()
+                    .0
+            }
+            _ => {
+                match self.source_text[previous_byte_offset..]
+                    .char_indices()
+                    .nth(char_index - previous_char_index)
+                {
+                    Some((byte_offset_from_previous, _ch)) => {
+                        previous_byte_offset + byte_offset_from_previous
+                    }
+                    None => self.source_text.len(),
+                }
+            }
         };
 
-        let trunc_lo = &self.source_text[lo_byte..];
-        let char_len = (span.hi - span.lo) as usize;
-        lo_byte..match trunc_lo.char_indices().nth(char_len) {
-            Some((offset, _ch)) => lo_byte + offset,
-            None => self.source_text.len(),
-        }
+        self.char_index_to_byte_offset
+            .insert(char_index, byte_offset);
+        byte_offset
     }
 
     fn source_text(&mut self, span: Span) -> String {

data/rust-vendor/proc-macro2/src/lib.rs

@@ -84,7 +84,7 @@
 //! a different thread.
 
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.105")]
+#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.106")]
 #![cfg_attr(any(proc_macro_span, super_unstable), feature(proc_macro_span))]
 #![cfg_attr(super_unstable, feature(proc_macro_def_site))]
 #![cfg_attr(docsrs, feature(doc_cfg))]

data/rust-vendor/quote/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"673a13d74b22c1f9af8ddf8fcf9b86c837ab88abd1af91d3aebb8526a5981d2a",".github/FUNDING.yml":"b017158736b3c9751a2d21edfce7fe61c8954e2fced8da8dd3013c2f3e295bd9",".github/workflows/ci.yml":"a68b4e7d3ae11b9e97d408b2b780aca8e6d19d011dc8b1de5cb44fcc077a93dc","Cargo.lock":"141f54098137c854e0dc84f3323f6864c23e3bd4d5ac9f39ea52118bf2c6acbb","Cargo.toml":"d6485a400ae2deb037095fcdf34e1e6f3d4fca9f8f7e16b3c8eba64e3239ce7f","Cargo.toml.orig":"ed98590b5d29470473a65c9a125609c5b1e008428663c2a670e6a36906cdb3c0","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5bc59a97099fbdc7f9f8b69d3f9910e27629184647412b5009b274b5b8bfb6d1","build.rs":"cd6808c02e476b09a520105e2c6f6d325cccb1ecd542cbbcc836a0ae6f6fb0f1","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/ext.rs":"dabcf1dbf9a81c2dccbfb85f81a08120f5a15be40616d51434ed4ebdfe0c7283","src/format.rs":"2f1c01cf36f7baf4ffd1a5b8abb4df5142e97ea8f8556d7cc1932854363e0934","src/ident_fragment.rs":"eed1a7407182c00ddfdc98741eaa6e234a6d2c01755e95f943b27926b8c92243","src/lib.rs":"e66cada1e9540c6bf73ac92e4029a1e17bd8d4a69e248d7a3e1b74dbe9fbd6ed","src/runtime.rs":"61a44fbd356735933c6cde876f6398ff4bdbde7a64b6f7db214dceea8173bfe9","src/spanned.rs":"713678bf5cb3b4bf2f119dcf64d188a63dc59455a724c3d2567ceab83b734d73","src/to_tokens.rs":"0d0a70923bf91ee43a4361dd3b6cd2ac52ceba736289a200b189769b8fc8c810","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/test.rs":"1d3ad35f55ef874cb7923ed97c924be752787887851bf0250a597226d335389b","tests/ui/does-not-have-iter-interpolated-dup.rs":"ad13eea21d4cdd2ab6c082f633392e1ff20fb0d1af5f2177041e0bf7f30da695","tests/ui/does-not-have-iter-interpolated-dup.stderr":"e5966b716290266591f97f1ab04107a47748d493e10ca99f19675fa76524f205","tests/ui/does-not-have-iter-interpolated.rs":"83a5b3f240651adcbe4b6e51076d76d653ad439b37442cf4054f1fd3c073f3b7","tests/ui/does-not-have-iter-interpolated.stderr":"a20403a06f36b54d45a195e455a11543cca7259e1c9f1bc78f0ce65cc0226347","tests/ui/does-not-have-iter-separated.rs":"fe413c48331d5e3a7ae5fef6a5892a90c72f610d54595879eb49d0a94154ba3f","tests/ui/does-not-have-iter-separated.stderr":"29718da7187e2da98c98bea9bfa405305a6df60af6c2f3c70cc27b7e13deead7","tests/ui/does-not-have-iter.rs":"09dc9499d861b63cebb0848b855b78e2dc9497bfde37ba6339f3625ae009a62f","tests/ui/does-not-have-iter.stderr":"691c985934330d5ba063fd4b172f89702673c710e610e8381e39ab78d729b0f1","tests/ui/not-quotable.rs":"5759d0884943417609f28faadc70254a3e2fd3d9bd6ff7297a3fb70a77fafd8a","tests/ui/not-quotable.stderr":"433a290bd53070d5cce6d623f9ef6f991756a78de109d3e486b46b699c2ce764","tests/ui/not-repeatable.rs":"a4b115c04e4e41049a05f5b69450503fbffeba031218b4189cb931839f7f9a9c","tests/ui/not-repeatable.stderr":"501ea5e47492b55bea457b02e991e0c624cd0c12601e0b759fff54a731370caf","tests/ui/wrong-type-span.rs":"6195e35ea844c0c52ba1cff5d790c3a371af6915d137d377834ad984229ef9ea","tests/ui/wrong-type-span.stderr":"cad072e40e0ecc04f375122ae41aede2f0da2a9244492b3fcf70249e59d1b128"},"package":"dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"}
+{"files":{".cargo_vcs_info.json":"94333ca7e9823d07e8a4d248b0f8c943aaa0bcc0fdaf5b37b5306c921b9c81ab",".github/FUNDING.yml":"b017158736b3c9751a2d21edfce7fe61c8954e2fced8da8dd3013c2f3e295bd9",".github/workflows/ci.yml":"b04aabb8eb8ecc7b9b443280fe51489df7fb450e327ee459a19e727c86793690","Cargo.lock":"44bd3ed7bd105a5c29ec4e585308c3d29a5e6d11e069ece44a5abe8e869e116d","Cargo.toml":"0eb3904bf712f0a2b4501057f0b4206ba5d3ecd31ff5c7708a5407164ee13657","Cargo.toml.orig":"39867fc2710eeff590ed41e0907591b0f2edf10f41c6897c0a21f554c91d4575","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5bc59a97099fbdc7f9f8b69d3f9910e27629184647412b5009b274b5b8bfb6d1","build.rs":"cd6808c02e476b09a520105e2c6f6d325cccb1ecd542cbbcc836a0ae6f6fb0f1","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/ext.rs":"dabcf1dbf9a81c2dccbfb85f81a08120f5a15be40616d51434ed4ebdfe0c7283","src/format.rs":"662db1f14106d79aacab400a3176a75989a4437ecaaa85ab88cd9a40b750cc5b","src/ident_fragment.rs":"eed1a7407182c00ddfdc98741eaa6e234a6d2c01755e95f943b27926b8c92243","src/lib.rs":"3647fe365bb87f0199dacc3bb39644335d49375c7c019305a90cb9953e3e32e1","src/runtime.rs":"fdb7986b31141627408b51381607f66ef4b69dd81b080c2f6489da267e96b2ba","src/spanned.rs":"713678bf5cb3b4bf2f119dcf64d188a63dc59455a724c3d2567ceab83b734d73","src/to_tokens.rs":"0d0a70923bf91ee43a4361dd3b6cd2ac52ceba736289a200b189769b8fc8c810","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/test.rs":"023d6b57ba5ba199a04d9757e3b1464c2bc09579b035ea82c047e08d89d19226","tests/ui/does-not-have-iter-interpolated-dup.rs":"ad13eea21d4cdd2ab6c082f633392e1ff20fb0d1af5f2177041e0bf7f30da695","tests/ui/does-not-have-iter-interpolated-dup.stderr":"d076d9581ce9f684dcf51aadcf77c206a8a1d3c6774cee14e5d40339ea3ebe07","tests/ui/does-not-have-iter-interpolated.rs":"83a5b3f240651adcbe4b6e51076d76d653ad439b37442cf4054f1fd3c073f3b7","tests/ui/does-not-have-iter-interpolated.stderr":"5b611cd647c162f9d5b52d8c3eb8ed50bd1d7d325671aaf85815d7420e867169","tests/ui/does-not-have-iter-separated.rs":"fe413c48331d5e3a7ae5fef6a5892a90c72f610d54595879eb49d0a94154ba3f","tests/ui/does-not-have-iter-separated.stderr":"43fe592afacc052da2d0c9525bf7160fd4a80effa0949e83fe6291b8d6257dcb","tests/ui/does-not-have-iter.rs":"09dc9499d861b63cebb0848b855b78e2dc9497bfde37ba6339f3625ae009a62f","tests/ui/does-not-have-iter.stderr":"ccd8fb640776402f7fc980be05df5f998b9557f67a0d5d2ab89f2f7b6bd0731a","tests/ui/not-quotable.rs":"5759d0884943417609f28faadc70254a3e2fd3d9bd6ff7297a3fb70a77fafd8a","tests/ui/not-quotable.stderr":"433a290bd53070d5cce6d623f9ef6f991756a78de109d3e486b46b699c2ce764","tests/ui/not-repeatable.rs":"a4b115c04e4e41049a05f5b69450503fbffeba031218b4189cb931839f7f9a9c","tests/ui/not-repeatable.stderr":"095da8ad7db595241a5df7615134d8dc07d607d9bad5fb8d9b771e6bae967c9c","tests/ui/wrong-type-span.rs":"6195e35ea844c0c52ba1cff5d790c3a371af6915d137d377834ad984229ef9ea","tests/ui/wrong-type-span.stderr":"cad072e40e0ecc04f375122ae41aede2f0da2a9244492b3fcf70249e59d1b128"},"package":"21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"}

data/rust-vendor/quote/.cargo_vcs_info.json

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "635ee674bf2cac1f30ab0ca4afb9d30cbf620ecc"
+    "sha1": "ad9fb4019efc3f34e5d3b9be416199937f7a8ee3"
   },
   "path_in_vcs": ""
 }

data/rust-vendor/quote/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, stable, beta, 1.76.0, 1.68.0]
+        rust: [nightly, stable, beta, 1.83.0, 1.68.0]
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v6

data/rust-vendor/quote/Cargo.lock

@@ -28,9 +28,9 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 
 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -50,25 +50,25 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.105"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.42"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 dependencies = [
  "proc-macro2",
  "rustversion",
@@ -106,15 +106,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
- "quote 1.0.42",
+ "quote 1.0.43",
  "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.148"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
  "memchr",
@@ -134,12 +134,12 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.113"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
  "proc-macro2",
- "quote 1.0.42",
+ "quote 1.0.43",
  "unicode-ident",
 ]
 
@@ -160,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.10+spec-1.1.0"
+version = "0.9.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"
+checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
 dependencies = [
  "indexmap",
  "serde_core",
@@ -251,6 +251,6 @@ checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 
 [[package]]
 name = "zmij"
-version = "1.0.11"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb2c125bd7365735bebeb420ccb880265ed2d2bddcbcd49f597fdfe6bd5e577"
+checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"

data/rust-vendor/quote/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.68"
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 build = "build.rs"
 autolib = false

data/rust-vendor/quote/Cargo.toml.orig

@@ -1,6 +1,6 @@
 [package]
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 autobenches = false
 categories = ["development-tools::procedural-macro-helpers"]

data/rust-vendor/quote/src/format.rs

@@ -4,8 +4,8 @@
 ///
 /// # Syntax
 ///
-/// Syntax is copied from the [`format_args!`] macro, supporting both positional
-/// and named arguments.
+/// Syntax is copied from the [`format!`][alloc::format!] macro, supporting both
+/// positional and named arguments.
 ///
 /// Only a limited set of formatting traits are supported. The current mapping
 /// of format types to traits is:

data/rust-vendor/quote/src/lib.rs

@@ -89,7 +89,7 @@
 //! [prettyplease]: https://github.com/dtolnay/prettyplease
 
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/quote/1.0.43")]
+#![doc(html_root_url = "https://docs.rs/quote/1.0.44")]
 #![allow(
     clippy::doc_markdown,
     clippy::elidable_lifetime_names,

data/rust-vendor/quote/src/runtime.rs

@@ -321,7 +321,7 @@ pub fn push_ident_spanned(tokens: &mut TokenStream, span: Span, s: &str) {
 #[doc(hidden)]
 pub fn push_lifetime(tokens: &mut TokenStream, lifetime: &str) {
     tokens.append(TokenTree::Punct(Punct::new('\'', Spacing::Joint)));
-    tokens.append(TokenTree::Ident(Ident::new(
+    tokens.append(TokenTree::Ident(ident_maybe_raw(
         &lifetime[1..],
         Span::call_site(),
     )));
@@ -334,7 +334,7 @@ pub fn push_lifetime_spanned(tokens: &mut TokenStream, span: Span, lifetime: &st
         apostrophe.set_span(span);
         apostrophe
     }));
-    tokens.append(TokenTree::Ident(Ident::new(&lifetime[1..], span)));
+    tokens.append(TokenTree::Ident(ident_maybe_raw(&lifetime[1..], span)));
 }
 
 macro_rules! push_punct {

data/rust-vendor/quote/tests/test.rs

@@ -540,6 +540,12 @@ fn test_quote_raw_id() {
     assert_eq!(id.to_string(), "r#raw_id");
 }
 
+#[test]
+fn test_quote_raw_lifetime() {
+    let lifetime = quote!('r#async);
+    assert_eq!(lifetime.to_string(), "'r#async");
+}
+
 #[test]
 fn test_type_inference_for_span() {
     trait CallSite {

data/rust-vendor/quote/tests/ui/does-not-have-iter-interpolated-dup.stderr

@@ -4,8 +4,8 @@ error[E0277]: repetition contains no interpolated value that is an iterator
 8 |     quote!(#(#nonrep #nonrep)*);
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ none of the values interpolated inside this repetition are iterable
   |
-help: the trait `CheckHasIterator<true>` is not implemented for `HasIterator<false>`
-      but it is implemented for `HasIterator<true>`
+help: the trait `quote::__private::CheckHasIterator<true>` is not implemented for `quote::__private::HasIterator<false>`
+      but it is implemented for `quote::__private::HasIterator<true>`
  --> src/runtime.rs
   |
   | impl CheckHasIterator<true> for HasIterator<true> {}

data/rust-vendor/quote/tests/ui/does-not-have-iter-interpolated.stderr

@@ -4,8 +4,8 @@ error[E0277]: repetition contains no interpolated value that is an iterator
 8 |     quote!(#(#nonrep)*);
   |     ^^^^^^^^^^^^^^^^^^^ none of the values interpolated inside this repetition are iterable
   |
-help: the trait `CheckHasIterator<true>` is not implemented for `HasIterator<false>`
-      but it is implemented for `HasIterator<true>`
+help: the trait `quote::__private::CheckHasIterator<true>` is not implemented for `quote::__private::HasIterator<false>`
+      but it is implemented for `quote::__private::HasIterator<true>`
  --> src/runtime.rs
   |
   | impl CheckHasIterator<true> for HasIterator<true> {}

data/rust-vendor/quote/tests/ui/does-not-have-iter-separated.stderr

@@ -4,8 +4,8 @@ error[E0277]: repetition contains no interpolated value that is an iterator
 4 |     quote!(#(a b),*);
   |     ^^^^^^^^^^^^^^^^ none of the values interpolated inside this repetition are iterable
   |
-help: the trait `CheckHasIterator<true>` is not implemented for `HasIterator<false>`
-      but it is implemented for `HasIterator<true>`
+help: the trait `quote::__private::CheckHasIterator<true>` is not implemented for `quote::__private::HasIterator<false>`
+      but it is implemented for `quote::__private::HasIterator<true>`
  --> src/runtime.rs
   |
   | impl CheckHasIterator<true> for HasIterator<true> {}

data/rust-vendor/quote/tests/ui/does-not-have-iter.stderr

@@ -4,8 +4,8 @@ error[E0277]: repetition contains no interpolated value that is an iterator
 4 |     quote!(#(a b)*);
   |     ^^^^^^^^^^^^^^^ none of the values interpolated inside this repetition are iterable
   |
-help: the trait `CheckHasIterator<true>` is not implemented for `HasIterator<false>`
-      but it is implemented for `HasIterator<true>`
+help: the trait `quote::__private::CheckHasIterator<true>` is not implemented for `quote::__private::HasIterator<false>`
+      but it is implemented for `quote::__private::HasIterator<true>`
  --> src/runtime.rs
   |
   | impl CheckHasIterator<true> for HasIterator<true> {}

data/rust-vendor/quote/tests/ui/not-repeatable.stderr

@@ -2,20 +2,20 @@ error[E0599]: the method `quote_into_iter` exists for struct `Ipv4Addr`, but its
  --> tests/ui/not-repeatable.rs:7:13
   |
 3 | struct Ipv4Addr;
-  | --------------- method `quote_into_iter` not found for this struct because it doesn't satisfy `Ipv4Addr: Iterator`, `Ipv4Addr: ToTokens`, `Ipv4Addr: ext::RepIteratorExt` or `Ipv4Addr: ext::RepToTokensExt`
+  | --------------- method `quote_into_iter` not found for this struct because it doesn't satisfy `Ipv4Addr: Iterator`, `Ipv4Addr: ToTokens`, `Ipv4Addr: quote::__private::ext::RepIteratorExt` or `Ipv4Addr: quote::__private::ext::RepToTokensExt`
 ...
 7 |     let _ = quote! { #(#ip)* };
   |             ^^^^^^^^^^^^^^^^^^ method cannot be called on `Ipv4Addr` due to unsatisfied trait bounds
   |
   = note: the following trait bounds were not satisfied:
           `Ipv4Addr: Iterator`
-          which is required by `Ipv4Addr: ext::RepIteratorExt`
+          which is required by `Ipv4Addr: quote::__private::ext::RepIteratorExt`
           `&Ipv4Addr: Iterator`
-          which is required by `&Ipv4Addr: ext::RepIteratorExt`
+          which is required by `&Ipv4Addr: quote::__private::ext::RepIteratorExt`
           `Ipv4Addr: ToTokens`
-          which is required by `Ipv4Addr: ext::RepToTokensExt`
+          which is required by `Ipv4Addr: quote::__private::ext::RepToTokensExt`
           `&mut Ipv4Addr: Iterator`
-          which is required by `&mut Ipv4Addr: ext::RepIteratorExt`
+          which is required by `&mut Ipv4Addr: quote::__private::ext::RepIteratorExt`
 note: the traits `Iterator` and `ToTokens` must be implemented
  --> $RUST/core/src/iter/traits/iterator.rs
   |
@@ -28,9 +28,9 @@ note: the traits `Iterator` and `ToTokens` must be implemented
   | ^^^^^^^^^^^^^^^^^^
   = help: items from traits can only be used if the trait is implemented and in scope
   = note: the following traits define an item `quote_into_iter`, perhaps you need to implement one of them:
-          candidate #1: `ext::RepAsIteratorExt`
-          candidate #2: `ext::RepIteratorExt`
-          candidate #3: `ext::RepToTokensExt`
+          candidate #1: `quote::__private::ext::RepAsIteratorExt`
+          candidate #2: `quote::__private::ext::RepIteratorExt`
+          candidate #3: `quote::__private::ext::RepToTokensExt`
   = note: this error originates in the macro `$crate::quote_bind_into_iter` which comes from the expansion of the macro `quote` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0282]: type annotations needed

data/rust-vendor/siphasher/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"a49c444f38f8687e36f168766025379c76c31906706985cc31e5c30d1540c8a6",".github/dependabot.yml":"9dc3030fc87139b49c283e6fafe1d1f46b2002659ab4eea26350f67d0367b491","COPYING":"4d40ffd1478e61d103063fe87b133d13b6784688b8855acd7ebc2aeb64095c6d","Cargo.toml":"e8484156079f567495be38cbd1c0ef9592542403c94e54e37e3674b77c07f2ae","Cargo.toml.orig":"c682a6a5b683e25010054f1a3e8139caaedb2cc7c644140d8198cd1f8801a079","README.md":"af6d54563bbcc675b002349cd883e44d607e45cbdd640ed452804533fef00bab","src/lib.rs":"ac6d8c8d89e5017c70e0c32610a391a715a02a84de1d8f615323b1beffec12b6","src/sip.rs":"b2f0067642100232f78f046167299972ec4e64bf8b9a48d5283ab9e0101e12da","src/sip128.rs":"eccfff86293b02af3e22a087592afcea08995f54c551e9fe0ec087e13d9e6eea","src/tests.rs":"99c299d1951aee4c70cd01bea8baabc151a7b316904e5d31de847807a671eaf5","src/tests128.rs":"227986a432d65be2c947a500209adb7767a376b49d82e448487db6a2215476cc"},"package":"56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"}
+{"files":{".cargo_vcs_info.json":"f0dca5ec37ad33a5d0705ed33ec30672947e6942c0beac3e9575152559a72176",".github/dependabot.yml":"9dc3030fc87139b49c283e6fafe1d1f46b2002659ab4eea26350f67d0367b491",".github/workflows/issues.yml":"b7f30a2a870d09450e0111f7fb5b3cf08a2fb369ccbd8e97e95b2286e5b8aa9b","COPYING":"c962ee4d1d05ddc138b202b2540219ebc57893fcf97b364852094a9a94ce1365","Cargo.lock":"bb8e55f320d27bef4a42fc4040ef054210435cb1719bfb3ddc453b9c63e9f010","Cargo.toml":"3a2533d229481b57cab0e16b3b8ce32fb0f0212842438f0f47d40dade278aa73","Cargo.toml.orig":"ceec825424bd52d44fadd389b69006495659d6aa75581184d4fa499eeee66295","README.md":"af6d54563bbcc675b002349cd883e44d607e45cbdd640ed452804533fef00bab","src/common.rs":"7319d34054413c01a3740a1d349c487125c5ffc5a39cddf562702f3560e1525a","src/lib.rs":"b58b7067ee6cad446233fbb17a30fb4828fa0c783a4d65c110374ecadc6e3e74","src/sip.rs":"3bd13f4265b55e432d1f21702dd63c97552663ddd0ac838d2d468648c8659c7e","src/sip128.rs":"3c562ba479afadcb0b6b99b66e9f67f8378f48eca774538a24f2e00653a34ba6","src/tests.rs":"6658c1ac8c688ed90682a6dbc759ab569d43a5fc1405df84575374507ce79a6a","src/tests128.rs":"ae4f63fcc9aa59614e87c53242dd8b533edfe28e55a76e6a6de13f3d51bf0b05"},"package":"b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"}

data/rust-vendor/siphasher/.cargo_vcs_info.json

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "f57236be563e74ed9d4a3df93b6d2da15660bd18"
+    "sha1": "db8172048a1c9bdef0dcec782d965c236161af13"
   },
   "path_in_vcs": ""
 }

data/rust-vendor/siphasher/.github/workflows/issues.yml

@@ -0,0 +1,17 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

data/rust-vendor/siphasher/COPYING

@@ -1,5 +1,5 @@
 Copyright 2012-2016 The Rust Project Developers.
-Copyright 2016-2024 Frank Denis.
+Copyright 2016-2026 Frank Denis.
 
 Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

data/rust-vendor/siphasher/Cargo.lock

@@ -0,0 +1,89 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "serde"
+version = "1.0.183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "siphasher"
+version = "1.0.2"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"

data/rust-vendor/siphasher/Cargo.toml

@@ -12,8 +12,14 @@
 [package]
 edition = "2018"
 name = "siphasher"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Frank Denis <github@pureftpd.org>"]
+build = false
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "SipHash-2-4, SipHash-1-3 and 128-bit variants in pure Rust"
 homepage = "https://docs.rs/siphasher"
 documentation = "https://docs.rs/siphasher"
@@ -30,10 +36,18 @@ categories = [
 license = "MIT/Apache-2.0"
 repository = "https://github.com/jedisct1/rust-siphash"
 
-[profile.release]
-opt-level = 3
-lto = true
-panic = "abort"
+[features]
+default = ["std"]
+serde_no_std = ["serde/alloc"]
+serde_std = [
+    "std",
+    "serde/std",
+]
+std = []
+
+[lib]
+name = "siphasher"
+path = "src/lib.rs"
 
 [dependencies.serde]
 version = "1.0"
@@ -44,11 +58,7 @@ optional = true
 version = "1.0"
 optional = true
 
-[features]
-default = ["std"]
-serde_no_std = ["serde/alloc"]
-serde_std = [
-    "std",
-    "serde/std",
-]
-std = []
+[profile.release]
+opt-level = 3
+lto = true
+panic = "abort"

data/rust-vendor/siphasher/Cargo.toml.orig

@@ -8,7 +8,7 @@ repository = "https://github.com/jedisct1/rust-siphash"
 homepage = "https://docs.rs/siphasher"
 documentation = "https://docs.rs/siphasher"
 readme = "README.md"
-version = "1.0.1"
+version = "1.0.2"
 categories = ["algorithms", "cryptography"]
 edition = "2018"
 

data/rust-vendor/siphasher/src/common.rs

@@ -0,0 +1,65 @@
+/// Compression round for SipHash algorithm.
+macro_rules! compress {
+    ($state:expr) => {{
+        compress!($state.v0, $state.v1, $state.v2, $state.v3)
+    }};
+    ($v0:expr, $v1:expr, $v2:expr, $v3:expr) => {{
+        $v0 = $v0.wrapping_add($v1);
+        $v1 = $v1.rotate_left(13);
+        $v1 ^= $v0;
+        $v0 = $v0.rotate_left(32);
+        $v2 = $v2.wrapping_add($v3);
+        $v3 = $v3.rotate_left(16);
+        $v3 ^= $v2;
+        $v0 = $v0.wrapping_add($v3);
+        $v3 = $v3.rotate_left(21);
+        $v3 ^= $v0;
+        $v2 = $v2.wrapping_add($v1);
+        $v1 = $v1.rotate_left(17);
+        $v1 ^= $v2;
+        $v2 = $v2.rotate_left(32);
+    }};
+}
+
+/// Loads an integer of the desired type from a byte stream, in LE order.
+macro_rules! load_int_le {
+    ($buf:expr, $i:expr, $int_ty:ident) => {{
+        debug_assert!($i + ::core::mem::size_of::<$int_ty>() <= $buf.len());
+        let mut data = 0 as $int_ty;
+        ::core::ptr::copy_nonoverlapping(
+            $buf.as_ptr().add($i),
+            &mut data as *mut _ as *mut u8,
+            ::core::mem::size_of::<$int_ty>(),
+        );
+        data.to_le()
+    }};
+}
+
+/// Loads a u64 using up to 7 bytes of a byte slice.
+///
+/// # Safety
+///
+/// The caller must ensure that `start + len <= buf.len()` and `len < 8`.
+#[inline]
+pub unsafe fn u8to64_le(buf: &[u8], start: usize, len: usize) -> u64 {
+    debug_assert!(len < 8);
+    let mut i = 0;
+    let mut out = 0;
+    if i + 3 < len {
+        out = load_int_le!(buf, start + i, u32) as u64;
+        i += 4;
+    }
+    if i + 1 < len {
+        out |= (load_int_le!(buf, start + i, u16) as u64) << (i * 8);
+        i += 2;
+    }
+    if i < len {
+        out |= (*buf.get_unchecked(start + i) as u64) << (i * 8);
+        i += 1;
+    }
+    debug_assert_eq!(i, len);
+    out
+}
+
+pub(crate) use compress;
+pub(crate) use load_int_le;