html-to-markdown 2.24.4 → 2.24.6

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

@@ -1,8 +1,8 @@
 //! This crate can parse a C++ “mangled” linker symbol name into a Rust value
 //! describing what the name refers to: a variable, a function, a virtual table,
-//! etc. The description type implements `Display`, producing human-readable
-//! text describing the mangled name. Debuggers and profilers can use this crate
-//! to provide more meaningful output.
+//! etc. The description type implements functions such as `demangle()`,
+//! producing human-readable text describing the mangled name. Debuggers and
+//! profilers can use this crate to provide more meaningful output.
 //!
 //! C++ requires the compiler to choose names for linker symbols consistently
 //! across compilation units, so that two compilation units that have seen the
@@ -22,8 +22,7 @@
 //!
 //! The Itanium C++ ABI specifies that the linker symbol for that function must
 //! be named `_ZN5space3fooEii`. This crate can parse that name into a Rust
-//! value representing its structure. Formatting the value with the `format!`
-//! macro or the `std::string::ToString::to_string` trait method yields the
+//! value representing its structure. That Rust value can be `demangle()`d to the
 //! string `space::foo(int, int)`, which is more meaningful to the C++
 //! developer.
 
@@ -151,7 +150,6 @@ where
     ///
     /// ```
     /// use cpp_demangle::Symbol;
-    /// use std::string::ToString;
     ///
     /// // First, something easy :)
     ///
@@ -160,7 +158,7 @@ where
     /// let sym = Symbol::new(&mangled[..])
     ///     .expect("Could not parse mangled symbol!");
     ///
-    /// let demangled = sym.to_string();
+    /// let demangled = sym.demangle().unwrap();
     /// assert_eq!(demangled, "space::foo(int, bool, char)");
     ///
     /// // Now let's try something a little more complicated!
@@ -171,7 +169,7 @@ where
     /// let sym = Symbol::new(&mangled[..])
     ///     .expect("Could not parse mangled symbol!");
     ///
-    /// let demangled = sym.to_string();
+    /// let demangled = sym.demangle().unwrap();
     /// assert_eq!(
     ///     demangled,
     ///     "JS_GetPropertyDescriptorById(JSContext*, JS::Handle<JSObject*>, JS::Handle<jsid>, JS::MutableHandle<JS::PropertyDescriptor>)"
@@ -186,7 +184,6 @@ where
     ///
     /// ```
     /// use cpp_demangle::{ParseOptions, Symbol};
-    /// use std::string::ToString;
     ///
     /// // First, something easy :)
     ///
@@ -198,7 +195,7 @@ where
     /// let sym = Symbol::new_with_options(&mangled[..], &parse_options)
     ///     .expect("Could not parse mangled symbol!");
     ///
-    /// let demangled = sym.to_string();
+    /// let demangled = sym.demangle().unwrap();
     /// assert_eq!(demangled, "space::foo(int, bool, char)");
     ///
     /// // Now let's try something a little more complicated!
@@ -209,7 +206,7 @@ where
     /// let sym = Symbol::new(&mangled[..])
     ///     .expect("Could not parse mangled symbol!");
     ///
-    /// let demangled = sym.to_string();
+    /// let demangled = sym.demangle().unwrap();
     /// assert_eq!(
     ///     demangled,
     ///     "JS_GetPropertyDescriptorById(JSContext*, JS::Handle<JSObject*>, JS::Handle<jsid>, JS::MutableHandle<JS::PropertyDescriptor>)"
@@ -252,27 +249,40 @@ substitutions = {:#?}",
         Ok(symbol)
     }
 
-    /// Demangle the symbol and return it as a String.
+    /// Demangle the symbol and return it as a String, with the default options.
+    ///
+    /// ```
+    /// use cpp_demangle::{DemangleOptions, Symbol};
     ///
-    /// Unlike the `ToString` implementation, this function allows options to
-    /// be specified.
+    /// let mangled = b"_ZN5space3fooEibc";
+    ///
+    /// let sym = Symbol::new(&mangled[..])
+    ///     .expect("Could not parse mangled symbol!");
+    ///
+    /// let demangled = sym.demangle().unwrap();
+    /// assert_eq!(demangled, "space::foo(int, bool, char)");
+    /// ```
+    #[inline]
+    pub fn demangle(&self) -> ::core::result::Result<String, fmt::Error> {
+        self.demangle_with_options(&Default::default())
+    }
+
+    /// Demangle the symbol and return it as a String.
     ///
     /// ```
     /// use cpp_demangle::{DemangleOptions, Symbol};
-    /// use std::string::ToString;
     ///
     /// let mangled = b"_ZN5space3fooEibc";
     ///
     /// let sym = Symbol::new(&mangled[..])
     ///     .expect("Could not parse mangled symbol!");
     ///
-    /// let demangled = sym.to_string();
     /// let options = DemangleOptions::default();
-    /// let demangled_again = sym.demangle(&options).unwrap();
-    /// assert_eq!(demangled_again, demangled);
+    /// let demangled = sym.demangle_with_options(&options).unwrap();
+    /// assert_eq!(demangled, "space::foo(int, bool, char)");
     /// ```
     #[allow(clippy::trivially_copy_pass_by_ref)]
-    pub fn demangle(
+    pub fn demangle_with_options(
         &self,
         options: &DemangleOptions,
     ) -> ::core::result::Result<String, fmt::Error> {
@@ -361,7 +371,6 @@ where
     ///
     /// ```
     /// use cpp_demangle::BorrowedSymbol;
-    /// use std::string::ToString;
     ///
     /// let mangled = b"_ZN5space3fooEibc and some trailing junk";
     ///
@@ -370,7 +379,7 @@ where
     ///
     /// assert_eq!(tail, b" and some trailing junk");
     ///
-    /// let demangled = sym.to_string();
+    /// let demangled = sym.demangle().unwrap();
     /// assert_eq!(demangled, "space::foo(int, bool, char)");
     /// ```
     #[inline]
@@ -387,7 +396,6 @@ where
     ///
     /// ```
     /// use cpp_demangle::{BorrowedSymbol, ParseOptions};
-    /// use std::string::ToString;
     ///
     /// let mangled = b"_ZN5space3fooEibc and some trailing junk";
     ///
@@ -399,7 +407,7 @@ where
     ///
     /// assert_eq!(tail, b" and some trailing junk");
     ///
-    /// let demangled = sym.to_string();
+    /// let demangled = sym.demangle().unwrap();
     /// assert_eq!(demangled, "space::foo(int, bool, char)");
     /// ```
     pub fn with_tail_and_options(
@@ -433,26 +441,3 @@ substitutions = {:#?}",
         Ok((symbol, tail.into()))
     }
 }
-
-impl<T> fmt::Display for Symbol<T>
-where
-    T: AsRef<[u8]>,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut out = String::new();
-        {
-            let options = DemangleOptions::default();
-            let mut ctx = ast::DemangleContext::new(
-                &self.substitutions,
-                self.raw.as_ref(),
-                options,
-                &mut out,
-            );
-            self.parsed.demangle(&mut ctx, None).map_err(|err| {
-                log!("Demangling error: {:#?}", err);
-                fmt::Error
-            })?;
-        }
-        write!(f, "{}", &out)
-    }
-}

data/rust-vendor/cpp_demangle/src/subs.rs

@@ -87,7 +87,7 @@ impl fmt::Debug for SubstitutionTable {
         f.debug_map()
             .entries(self.substitutions.iter().enumerate())
             .finish()?;
-        f.pad("non_substitutions ")?;
+        f.pad(" non_substitutions ")?;
         f.debug_map()
             .entries(self.non_substitutions.iter().enumerate())
             .finish()

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

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"ce860e1b5ab14cd60b3f71ec176b6d0889aa0dbbbaa704baa25913ea74c202d6","Cargo.lock":"0a08b1cf7c5cbb1e2d090bfd1e21db2fcd992041c489f261a513b679a5c3baaf","Cargo.toml":"485e818058e35bcd3c30d2b67f16f209903cdadc6a1d622f59ffb4bffb58a0ad","Cargo.toml.orig":"618593cb0f85fcc97a489b4ef4c9566c4497f87fd483eebdb61ae50d8b3b7066","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"75d3bf11a47fed60aee0a6cc56a97b896b470ee8fb52d6cd553bd8348337f422","MAINTENANCE.md":"2904034aa8766570e5ba28b787084ea123b7c137bd688c0900d3bb6cf69a17eb","README.md":"7958879222474ae6e290335294d3e752bb9142d611bcf800bb1c8ba0a9620871","examples/compress_file.rs":"cbdb8b0c556409b82f894ad5326babb6dba42c219d2d675927e7f5820053b295","examples/decompress_file.rs":"d626001235de051b3372d0fe8cc61a8fdf3da078e28cc4a5414578708792cad8","examples/deflatedecoder-bufread.rs":"5b8abebce157f9b7cc3f6b5c90b9d533890a514e5f8d91bb43439f52fdc9ddce","examples/deflatedecoder-read.rs":"921e13031c5436494d8af0a8705a0adda2da536edefef2e1e311dffa8acd120f","examples/deflatedecoder-write.rs":"cfce37e8758c6d543dd130c7bdff571af3c8cd11bafcc933740107a3576832df","examples/deflateencoder-bufread.rs":"9fdd7d632d861f099d19a3ec1de539d9600f8004a119dd2a70f6aba5965b2e1c","examples/deflateencoder-read.rs":"8740a942ec7d07ccb4b57c5baac7a4d649817bffe4e37ce9a06c7d6d70378e4c","examples/deflateencoder-write.rs":"8e45425684b2368ef95f3704dce6f8077f38b9a90a38d147594c7c570f0d1c6c","examples/gzbuilder.rs":"d09c83417e4a01a8593ce3462a33340e6fe17fa51b4b0b3a6005b68959df4d8c","examples/gzdecoder-bufread.rs":"76880f3e6e10ed4a0bf564be9ddae1c50811aeabf61fb573039538b81805f390","examples/gzdecoder-read.rs":"a4c5807be2c6bcf55a48abcc0b80b2bc62916b57564bea1927b3978dc5a4ed57","examples/gzdecoder-write.rs":"d0a982377ca1d2fd1786bb32f16454b4f0afdba5e1c7f0ab97e15e8827d351d5","examples/gzencoder-bufread.rs":"760670c124b1c5776b63c300c7e8a1dcd5e0ae633017dcf2e3d2d6e997dcc9c4","examples/gzencoder-read.rs":"27ec68675418bb7d1a110b8d1f33e7b1069f42bcce6f21f8d9235bde405cdf9f","examples/gzencoder-write.rs":"f127f2e398231d03269770fa18ac5d465f8d56d283f1118055f04f1d03369c31","examples/gzmultidecoder-bufread.rs":"bfa6c5554c3da5a61a7d1e1dad115b7ee784d136e2ac61272c87ad3e1eb4ec4c","examples/gzmultidecoder-read.rs":"c058d5eee5bf45b38132f8e487a714c9521191c7dabe2459362d2f8de689c6bf","examples/hello_world.txt":"d2a84f4b8b650937ec8f73cd8be2c74add5a911ba64df27458ed8229da804a26","examples/hello_world.txt.gz":"8b4c5972b92b8ee8dc99116e278afb9165276ddb13c0d334c8da2770fd4d1f7d","examples/zlibdecoder-bufread.rs":"0f541ec64c635d45fc206a02718c0b90c49123a0441a95455d6a8a9e0d20e011","examples/zlibdecoder-read.rs":"bbd85b47b8b804c3294b3f23f978eaf6fb09a187cb46eb86ae1ae2790dfab8d9","examples/zlibdecoder-write.rs":"f347a831d7201d3efd604b006c88421fa2a5906c6377b47c7ae391d0809186e6","examples/zlibencoder-bufread.rs":"e0e05686ad4521ba18b742a5cbbc5937cec1fd8b9e8313070b32c6f178dfbaf6","examples/zlibencoder-read.rs":"4a3156dc73cd77e6ac56700680652be63a1270d95ce384ebcd5c014cce2d5179","examples/zlibencoder-write.rs":"822d4cd326ac7402ff8f828c1dbb3aa108c68a89fc04488da252ca6a74e624b0","src/bufreader.rs":"2d6a59330e8f838eb6474d19104f21cb98236125c189f36bdff75a069a4cea8f","src/crc.rs":"de4eb1fcaa2e070cf6f1b55ad461467862683cfdd7a3ddd92cf73a2a795e645a","src/deflate/bufread.rs":"210479a3bf871d86b4f786345fb68ac3f988de96cbed3c3b6f57cabe2b184ad7","src/deflate/mod.rs":"5f26c8d2e21fb3c5b1275b18b38adc945d6398575eb863c289d7d4ecc71b6ee1","src/deflate/read.rs":"6562c1747898f2fa43c487cef5254f490f8ca38f2613315db279ee96c112e2e4","src/deflate/write.rs":"15c730f70cdec6ebac7246a56f475db2774f3ba77d25ddc54f3d0f04ab4670a7","src/ffi/c.rs":"0901a75612aea1c917884eb4c9a8d4196a559fd6f2a07654543c95b58b2c8f31","src/ffi/miniz_oxide.rs":"a3686f151cb0fc555bf24e670d5634bd09829919c84742977ad33a771a49f18b","src/ffi/mod.rs":"5ddbb8550f0705605b1d0f1ea448537e0a263e999d2f60d36edf3954043c522d","src/ffi/zlib_rs.rs":"17df19e5cd95403ad0dd1b15a787408a39de1c9c58eaed2f20189fdd29d352cc","src/gz/bufread.rs":"f8620d184d9590a695a3219bb17227b906aab0e588e444d90402e5b1e430f5a9","src/gz/mod.rs":"beb35e684123af26a393576653038c82291202a0e28a126e15d2d2993f55b959","src/gz/read.rs":"6cbb895787e3058eec59e01ab3fc959d77c338d76972a21b65947945e3a3fc3a","src/gz/write.rs":"09c06d423a2ef29774edd4d3436fb3fbcb00516aa619c0c4f7470bb5ff27277f","src/lib.rs":"86b5c51d300b14e4f3595cd6ff0414a72f7335bbad21231a1666de038f3c8dcf","src/mem.rs":"87acff0109b57f2b29cccfec6224054e2b3c9acbf9e03256e9d3d58575bb24e0","src/zio.rs":"7f26494078fb112f21c738b6dc3a1469e3a6e4f5ca3a8842cc2e5fff43245a44","src/zlib/bufread.rs":"111ca2eae88a707ea16202149108ef0af5628d16f076d25a36b4d806bbb05722","src/zlib/mod.rs":"e535804b61af961019139ce28e5e75272c2037dd897a64b19f1723b24efd9c28","src/zlib/read.rs":"4c6399cd986a483190309b4ea8795f30afe4319b4f28215c4541b932c99d3467","src/zlib/write.rs":"8a4cec1fd791b92e6bcf4bdee4f83c8ecc683151f31def8471939113739d7d33","tests/capabilities.rs":"99b35152615f5cbc31ca74e0dedbb244ffee4ef225dcd7cb7ab844fe807796f4","tests/corrupt-gz-file.bin":"083dd284aa1621916a2d0f66ea048c8d3ba7a722b22d0d618722633f51e7d39c","tests/early-flush.rs":"9a4db8fcbac659c52cafe5e1ab647d86781cf8b1f298d8dee34223c0292e0d74","tests/empty-read.rs":"39143ff0383655bb115e995b2a953f11e82d0ac03b4bec080973be7c2d421054","tests/good-file.gz":"87296963e53024a74752179ce7e54087565d358a85d3e65c3b37ef36eaa3d4a6","tests/good-file.txt":"bc4e03658a441fe2ad2df7cd2197144b87e41696f01e327b380e869cd9b485a0","tests/gunzip.rs":"c00946db2147b23c4300c77fedf0a04e65c774101575e9828433831311416a50","tests/multi.gz":"efa3341da052f95056314cc6920e02a3da15bdef30234b2552fb407812db5cc6","tests/multi.txt":"dbea9325179efe46ea2add94f7b6b745ca983fabb208dc6d34aa064623d7ee23","tests/zero-write.rs":"cde1a675491d88e59a711103d3b0df4c77b60e8152b90d5a4f01b97879f8f8dc"},"package":"b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"}
+{"files":{".cargo_vcs_info.json":"2f2b2f2c5303d08333d3be75473f84be0a7a9811876cf74bf847c2773f4ab7fb","Cargo.lock":"bb3afa38846a2756d09b3bce4e6f280a50ad4ada7919ccffd3d919a1c6af3037","Cargo.toml":"06464242e6674c339ff6c564551fddc9288a57c2bc1b78f363a643d7c566f007","Cargo.toml.orig":"688299f32b3704baf5e47d817587ca8a2be8e0a3b2bf767b8fca5df45e5e37b9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"025436edff4cfcdde17a5811fdea78892d8482efd1abdec5a17872d07a4f2112","MAINTENANCE.md":"2904034aa8766570e5ba28b787084ea123b7c137bd688c0900d3bb6cf69a17eb","README.md":"7958879222474ae6e290335294d3e752bb9142d611bcf800bb1c8ba0a9620871","examples/compress_file.rs":"cbdb8b0c556409b82f894ad5326babb6dba42c219d2d675927e7f5820053b295","examples/decompress_file.rs":"d626001235de051b3372d0fe8cc61a8fdf3da078e28cc4a5414578708792cad8","examples/deflatedecoder-bufread.rs":"5b8abebce157f9b7cc3f6b5c90b9d533890a514e5f8d91bb43439f52fdc9ddce","examples/deflatedecoder-read.rs":"921e13031c5436494d8af0a8705a0adda2da536edefef2e1e311dffa8acd120f","examples/deflatedecoder-write.rs":"cfce37e8758c6d543dd130c7bdff571af3c8cd11bafcc933740107a3576832df","examples/deflateencoder-bufread.rs":"9fdd7d632d861f099d19a3ec1de539d9600f8004a119dd2a70f6aba5965b2e1c","examples/deflateencoder-read.rs":"8740a942ec7d07ccb4b57c5baac7a4d649817bffe4e37ce9a06c7d6d70378e4c","examples/deflateencoder-write.rs":"8e45425684b2368ef95f3704dce6f8077f38b9a90a38d147594c7c570f0d1c6c","examples/gzbuilder.rs":"d09c83417e4a01a8593ce3462a33340e6fe17fa51b4b0b3a6005b68959df4d8c","examples/gzdecoder-bufread.rs":"76880f3e6e10ed4a0bf564be9ddae1c50811aeabf61fb573039538b81805f390","examples/gzdecoder-read.rs":"a4c5807be2c6bcf55a48abcc0b80b2bc62916b57564bea1927b3978dc5a4ed57","examples/gzdecoder-write.rs":"d0a982377ca1d2fd1786bb32f16454b4f0afdba5e1c7f0ab97e15e8827d351d5","examples/gzencoder-bufread.rs":"760670c124b1c5776b63c300c7e8a1dcd5e0ae633017dcf2e3d2d6e997dcc9c4","examples/gzencoder-read.rs":"27ec68675418bb7d1a110b8d1f33e7b1069f42bcce6f21f8d9235bde405cdf9f","examples/gzencoder-write.rs":"f127f2e398231d03269770fa18ac5d465f8d56d283f1118055f04f1d03369c31","examples/gzmultidecoder-bufread.rs":"bfa6c5554c3da5a61a7d1e1dad115b7ee784d136e2ac61272c87ad3e1eb4ec4c","examples/gzmultidecoder-read.rs":"c058d5eee5bf45b38132f8e487a714c9521191c7dabe2459362d2f8de689c6bf","examples/hello_world.txt":"d2a84f4b8b650937ec8f73cd8be2c74add5a911ba64df27458ed8229da804a26","examples/hello_world.txt.gz":"8b4c5972b92b8ee8dc99116e278afb9165276ddb13c0d334c8da2770fd4d1f7d","examples/zlibdecoder-bufread.rs":"0f541ec64c635d45fc206a02718c0b90c49123a0441a95455d6a8a9e0d20e011","examples/zlibdecoder-read.rs":"bbd85b47b8b804c3294b3f23f978eaf6fb09a187cb46eb86ae1ae2790dfab8d9","examples/zlibdecoder-write.rs":"f347a831d7201d3efd604b006c88421fa2a5906c6377b47c7ae391d0809186e6","examples/zlibencoder-bufread.rs":"e0e05686ad4521ba18b742a5cbbc5937cec1fd8b9e8313070b32c6f178dfbaf6","examples/zlibencoder-read.rs":"4a3156dc73cd77e6ac56700680652be63a1270d95ce384ebcd5c014cce2d5179","examples/zlibencoder-write.rs":"822d4cd326ac7402ff8f828c1dbb3aa108c68a89fc04488da252ca6a74e624b0","src/bufreader.rs":"2d6a59330e8f838eb6474d19104f21cb98236125c189f36bdff75a069a4cea8f","src/crc.rs":"8edfb6729f2dab784d2c4df66e0a0ff493095077b5307ca36afdbc53dad1f8e4","src/deflate/bufread.rs":"210479a3bf871d86b4f786345fb68ac3f988de96cbed3c3b6f57cabe2b184ad7","src/deflate/mod.rs":"5f26c8d2e21fb3c5b1275b18b38adc945d6398575eb863c289d7d4ecc71b6ee1","src/deflate/read.rs":"6562c1747898f2fa43c487cef5254f490f8ca38f2613315db279ee96c112e2e4","src/deflate/write.rs":"15c730f70cdec6ebac7246a56f475db2774f3ba77d25ddc54f3d0f04ab4670a7","src/ffi/c.rs":"0901a75612aea1c917884eb4c9a8d4196a559fd6f2a07654543c95b58b2c8f31","src/ffi/miniz_oxide.rs":"a3686f151cb0fc555bf24e670d5634bd09829919c84742977ad33a771a49f18b","src/ffi/mod.rs":"5ddbb8550f0705605b1d0f1ea448537e0a263e999d2f60d36edf3954043c522d","src/ffi/zlib_rs.rs":"17df19e5cd95403ad0dd1b15a787408a39de1c9c58eaed2f20189fdd29d352cc","src/gz/bufread.rs":"f8620d184d9590a695a3219bb17227b906aab0e588e444d90402e5b1e430f5a9","src/gz/mod.rs":"f3ea1985ba4b3430a96e36aa87290706d673be9db3ed2f353247d3acfb54a685","src/gz/read.rs":"6cbb895787e3058eec59e01ab3fc959d77c338d76972a21b65947945e3a3fc3a","src/gz/write.rs":"09c06d423a2ef29774edd4d3436fb3fbcb00516aa619c0c4f7470bb5ff27277f","src/lib.rs":"86b5c51d300b14e4f3595cd6ff0414a72f7335bbad21231a1666de038f3c8dcf","src/mem.rs":"87acff0109b57f2b29cccfec6224054e2b3c9acbf9e03256e9d3d58575bb24e0","src/zio.rs":"7f26494078fb112f21c738b6dc3a1469e3a6e4f5ca3a8842cc2e5fff43245a44","src/zlib/bufread.rs":"111ca2eae88a707ea16202149108ef0af5628d16f076d25a36b4d806bbb05722","src/zlib/mod.rs":"e535804b61af961019139ce28e5e75272c2037dd897a64b19f1723b24efd9c28","src/zlib/read.rs":"4c6399cd986a483190309b4ea8795f30afe4319b4f28215c4541b932c99d3467","src/zlib/write.rs":"8a4cec1fd791b92e6bcf4bdee4f83c8ecc683151f31def8471939113739d7d33","tests/capabilities.rs":"99b35152615f5cbc31ca74e0dedbb244ffee4ef225dcd7cb7ab844fe807796f4","tests/corrupt-gz-file.bin":"083dd284aa1621916a2d0f66ea048c8d3ba7a722b22d0d618722633f51e7d39c","tests/early-flush.rs":"9a4db8fcbac659c52cafe5e1ab647d86781cf8b1f298d8dee34223c0292e0d74","tests/empty-read.rs":"39143ff0383655bb115e995b2a953f11e82d0ac03b4bec080973be7c2d421054","tests/good-file.gz":"87296963e53024a74752179ce7e54087565d358a85d3e65c3b37ef36eaa3d4a6","tests/good-file.txt":"bc4e03658a441fe2ad2df7cd2197144b87e41696f01e327b380e869cd9b485a0","tests/gunzip.rs":"c00946db2147b23c4300c77fedf0a04e65c774101575e9828433831311416a50","tests/multi.gz":"efa3341da052f95056314cc6920e02a3da15bdef30234b2552fb407812db5cc6","tests/multi.txt":"dbea9325179efe46ea2add94f7b6b745ca983fabb208dc6d34aa064623d7ee23","tests/zero-write.rs":"cde1a675491d88e59a711103d3b0df4c77b60e8152b90d5a4f01b97879f8f8dc"},"package":"843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"}

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

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "8b66c27705ac7ea7ddf50768dedfbe23ead90a4e"
+    "sha1": "19ddb18bf11199858fbc6504d079448fafd1606e"
   },
   "path_in_vcs": ""
 }

data/rust-vendor/flate2/Cargo.lock

@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.8"
+version = "1.1.9"
 dependencies = [
  "cloudflare-zlib-sys",
  "crc32fast",
@@ -340,6 +340,6 @@ dependencies = [
 
 [[package]]
 name = "zlib-rs"
-version = "0.5.5"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3"
+checksum = "a7948af682ccbc3342b6e9420e8c51c1fe5d7bf7756002b4a3c6cabfe96a7e3c"

data/rust-vendor/flate2/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2018"
 rust-version = "1.67.0"
 name = "flate2"
-version = "1.1.8"
+version = "1.1.9"
 authors = [
     "Alex Crichton <alex@alexcrichton.com>",
     "Josh Triplett <josh@joshtriplett.org>",
@@ -61,9 +61,15 @@ any_zlib = ["any_impl"]
 cloudflare_zlib = [
     "any_c_zlib",
     "cloudflare-zlib-sys",
+    "dep:crc32fast",
 ]
 default = ["rust_backend"]
 miniz-sys = ["rust_backend"]
+miniz_oxide = [
+    "any_impl",
+    "dep:miniz_oxide",
+    "dep:crc32fast",
+]
 rust_backend = [
     "miniz_oxide",
     "any_impl",
@@ -71,18 +77,22 @@ rust_backend = [
 zlib = [
     "any_c_zlib",
     "libz-sys",
+    "dep:crc32fast",
 ]
 zlib-default = [
     "any_c_zlib",
     "libz-sys/default",
+    "dep:crc32fast",
 ]
 zlib-ng = [
     "any_c_zlib",
     "libz-ng-sys",
+    "dep:crc32fast",
 ]
 zlib-ng-compat = [
     "zlib",
     "libz-sys/zlib-ng",
+    "dep:crc32fast",
 ]
 zlib-rs = [
     "any_zlib",
@@ -211,6 +221,7 @@ optional = true
 
 [dependencies.crc32fast]
 version = "1.2.0"
+optional = true
 
 [dependencies.document-features]
 version = "0.2"
@@ -235,7 +246,7 @@ optional = true
 default-features = false
 
 [dependencies.zlib-rs]
-version = "0.5.5"
+version = "0.6.0"
 features = [
     "std",
     "rust-allocator",

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

@@ -1,7 +1,7 @@
 [package]
 name = "flate2"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Josh Triplett <josh@joshtriplett.org>"]
-version = "1.1.8"
+version = "1.1.9"
 edition = "2018"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
@@ -22,12 +22,12 @@ exclude = [".*"]
 libz-sys = { version = "1.1.20", optional = true, default-features = false }
 libz-ng-sys = { version = "1.1.16", optional = true }
 # this matches the default features, but we don't want to depend on the default features staying the same
-zlib-rs = { version = "0.5.5", optional = true, default-features = false, features = ["std", "rust-allocator"] }
+zlib-rs = { version = "0.6.0", optional = true, default-features = false, features = ["std", "rust-allocator"] }
 cloudflare-zlib-sys = { version = "0.3.6", optional = true }
 ## This implementation uses only safe Rust code and doesn't require a C compiler.
 ## It provides good performance for most use cases while being completely portable.
 miniz_oxide = { version = "0.8.5", optional = true, default-features = false, features = ["with-alloc", "simd"] }
-crc32fast = "1.2.0"
+crc32fast = { version = "1.2.0", optional = true }
 document-features = { version = "0.2", optional = true }
 
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
@@ -48,11 +48,6 @@ default = ["rust_backend"]
 #! Only one backend should be enabled at a time, or else one will see an unstable order which is currently
 #! `zlib-ng`, `zlib-rs`, `cloudflare_zlib`, `miniz_oxide` and which may change at any time.
 
-## Use the zlib-rs backend, a pure Rust rewrite of zlib.
-## This is the fastest backend overall, providing excellent performance with some `unsafe` code.
-## It does not require a C compiler but uses `unsafe` Rust for optimization.
-zlib-rs = ["any_zlib", "dep:zlib-rs"]
-
 ## Use the pure Rust `miniz_oxide` backend (default).
 ## This implementation uses only safe Rust code and doesn't require a C compiler.
 ## It provides good performance for most use cases while being completely portable.
@@ -60,14 +55,22 @@ zlib-rs = ["any_zlib", "dep:zlib-rs"]
 ## Note that this feature at some point may be switched to use `zlib-rs` instead.
 rust_backend = ["miniz_oxide", "any_impl"]
 
+## Use the zlib-rs backend, a pure Rust rewrite of zlib.
+## This is the fastest backend overall, providing excellent performance with some `unsafe` code.
+## It does not require a C compiler but uses `unsafe` Rust for optimization.
+zlib-rs = ["any_zlib", "dep:zlib-rs"] # zlib-rs uses its own crc32 implementation.
+
+## Use the pure Rust `miniz_oxide` backend.
+miniz_oxide = ["any_impl", "dep:miniz_oxide", "dep:crc32fast"]
+
 ## Use the system's installed zlib library.
 ## This is useful when you need compatibility with other C code that uses zlib,
 ## or when you want to use the system-provided zlib for consistency.
-zlib = ["any_c_zlib", "libz-sys"]
+zlib = ["any_c_zlib", "libz-sys", "dep:crc32fast"]
 
 ## Use the system's installed zlib library with default features enabled.
 ## Similar to `zlib` but enables additional features from libz-sys.
-zlib-default = ["any_c_zlib", "libz-sys/default"]
+zlib-default = ["any_c_zlib", "libz-sys/default", "dep:crc32fast"]
 
 ## Use zlib-ng in zlib-compat mode via libz-sys.
 ## This provides zlib-ng's performance improvements while maintaining compatibility.
@@ -78,18 +81,18 @@ zlib-default = ["any_c_zlib", "libz-sys/default"]
 ## See [the libz-sys README](https://github.com/rust-lang/libz-sys/blob/main/README.md) for details.
 ## To avoid that, use the `"zlib-ng"` feature instead.
 
-zlib-ng-compat = ["zlib", "libz-sys/zlib-ng"]
+zlib-ng-compat = ["zlib", "libz-sys/zlib-ng", "dep:crc32fast"]
 
 ## Use the high-performance zlib-ng library directly.
 ## This typically provides better performance than stock zlib and works even when
 ## other dependencies use zlib. Requires a C compiler.
-zlib-ng = ["any_c_zlib", "libz-ng-sys"]
+zlib-ng = ["any_c_zlib", "libz-ng-sys", "dep:crc32fast"]
 
 ## Use Cloudflare's optimized zlib implementation.
 ## This provides better performance than stock zlib on x86-64 (with SSE 4.2) and ARM64 (with NEON & CRC).
 ## * ⚠ Does not support 32-bit CPUs and is incompatible with mingw.
 ## * ⚠ May cause conflicts if other crates use different zlib versions.
-cloudflare_zlib = ["any_c_zlib", "cloudflare-zlib-sys"]
+cloudflare_zlib = ["any_c_zlib", "cloudflare-zlib-sys", "dep:crc32fast"]
 
 ## Deprecated alias for `rust_backend`, provided for backwards compatibility.
 ## Use `rust_backend` instead.

data/rust-vendor/flate2/LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2025 Alex Crichton
+Copyright (c) 2014-2026 Alex Crichton
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

data/rust-vendor/flate2/src/crc.rs

@@ -3,62 +3,123 @@
 use std::io;
 use std::io::prelude::*;
 
-use crc32fast::Hasher;
+#[cfg(not(feature = "zlib-rs"))]
+pub use impl_crc32fast::Crc;
 
-/// The CRC calculated by a [`CrcReader`].
-///
-/// [`CrcReader`]: struct.CrcReader.html
-#[derive(Debug, Default)]
-pub struct Crc {
-    amt: u32,
-    hasher: Hasher,
-}
+#[cfg(feature = "zlib-rs")]
+pub use impl_zlib_rs::Crc;
 
-/// A wrapper around a [`Read`] that calculates the CRC.
-///
-/// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
-#[derive(Debug)]
-pub struct CrcReader<R> {
-    inner: R,
-    crc: Crc,
-}
+#[cfg(not(feature = "zlib-rs"))]
+mod impl_crc32fast {
+    use crc32fast::Hasher;
 
-impl Crc {
-    /// Create a new CRC.
-    pub fn new() -> Self {
-        Self::default()
+    /// The CRC calculated by a [`CrcReader`].
+    ///
+    /// [`CrcReader`]: struct.CrcReader.html
+    #[derive(Debug, Default)]
+    pub struct Crc {
+        amt: u32,
+        hasher: Hasher,
     }
 
-    /// Returns the current crc32 checksum.
-    pub fn sum(&self) -> u32 {
-        self.hasher.clone().finalize()
-    }
+    impl Crc {
+        /// Create a new CRC.
+        pub fn new() -> Self {
+            Self::default()
+        }
 
-    /// The number of bytes that have been used to calculate the CRC.
-    /// This value is only accurate if the amount is lower than 2<sup>32</sup>.
-    pub fn amount(&self) -> u32 {
-        self.amt
-    }
+        /// Returns the current crc32 checksum.
+        pub fn sum(&self) -> u32 {
+            self.hasher.clone().finalize()
+        }
+
+        /// The number of bytes that have been used to calculate the CRC.
+        /// This value is only accurate if the amount is lower than 2<sup>32</sup>.
+        pub fn amount(&self) -> u32 {
+            self.amt
+        }
+
+        /// Update the CRC with the bytes in `data`.
+        pub fn update(&mut self, data: &[u8]) {
+            self.amt = self.amt.wrapping_add(data.len() as u32);
+            self.hasher.update(data);
+        }
+
+        /// Reset the CRC.
+        pub fn reset(&mut self) {
+            self.amt = 0;
+            self.hasher.reset();
+        }
 
-    /// Update the CRC with the bytes in `data`.
-    pub fn update(&mut self, data: &[u8]) {
-        self.amt = self.amt.wrapping_add(data.len() as u32);
-        self.hasher.update(data);
+        /// Combine the CRC with the CRC for the subsequent block of bytes.
+        pub fn combine(&mut self, additional_crc: &Self) {
+            self.amt = self.amt.wrapping_add(additional_crc.amt);
+            self.hasher.combine(&additional_crc.hasher);
+        }
     }
+}
 
-    /// Reset the CRC.
-    pub fn reset(&mut self) {
-        self.amt = 0;
-        self.hasher.reset();
+#[cfg(feature = "zlib-rs")]
+mod impl_zlib_rs {
+    /// The CRC calculated by a [`CrcReader`].
+    ///
+    /// [`CrcReader`]: struct.CrcReader.html
+    #[derive(Debug, Default)]
+    pub struct Crc {
+        consumed: u64,
+        state: u32,
     }
 
-    /// Combine the CRC with the CRC for the subsequent block of bytes.
-    pub fn combine(&mut self, additional_crc: &Crc) {
-        self.amt = self.amt.wrapping_add(additional_crc.amt);
-        self.hasher.combine(&additional_crc.hasher);
+    impl Crc {
+        /// Create a new CRC.
+        pub fn new() -> Self {
+            Self::default()
+        }
+
+        /// Returns the current crc32 checksum.
+        pub fn sum(&self) -> u32 {
+            self.state
+        }
+
+        /// The number of bytes that have been used to calculate the CRC.
+        /// This value is only accurate if the amount is lower than 2<sup>32</sup>.
+        pub fn amount(&self) -> u32 {
+            self.consumed as u32
+        }
+
+        /// Update the CRC with the bytes in `data`.
+        pub fn update(&mut self, data: &[u8]) {
+            self.consumed = self.consumed.wrapping_add(data.len() as u64);
+            self.state = zlib_rs::crc32::crc32(self.state, data);
+        }
+
+        /// Reset the CRC.
+        pub fn reset(&mut self) {
+            self.consumed = 0;
+            self.state = 0
+        }
+
+        /// Combine the CRC with the CRC for the subsequent block of bytes.
+        pub fn combine(&mut self, additional_crc: &Self) {
+            self.consumed = self.consumed.wrapping_add(additional_crc.consumed);
+            self.state = zlib_rs::crc32::crc32_combine(
+                self.state,
+                additional_crc.state,
+                additional_crc.consumed,
+            );
+        }
     }
 }
 
+/// A wrapper around a [`Read`] that calculates the CRC.
+///
+/// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
+pub struct CrcReader<R> {
+    inner: R,
+    crc: Crc,
+}
+
 impl<R: Read> CrcReader<R> {
     /// Create a new `CrcReader`.
     pub fn new(r: R) -> CrcReader<R> {
@@ -173,3 +234,77 @@ impl<W: Write> Write for CrcWriter<W> {
         self.inner.flush()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Crc;
+
+    fn crc_of(data: &[u8]) -> Crc {
+        let mut c = Crc::new();
+        c.update(data);
+        c
+    }
+
+    fn sum_of(data: &[u8]) -> u32 {
+        crc_of(data).sum()
+    }
+
+    #[test]
+    fn new_is_empty() {
+        let c = Crc::new();
+        assert_eq!(c.amount(), 0);
+        assert_eq!(c.sum(), 0);
+    }
+
+    #[test]
+    fn known_vector_hello() {
+        assert_eq!(sum_of(b"hello"), 0x3610_A686);
+    }
+
+    #[test]
+    fn known_vector_quick_brown_fox() {
+        assert_eq!(
+            sum_of(b"The quick brown fox jumps over the lazy dog"),
+            0x414F_A339
+        );
+    }
+
+    #[test]
+    fn update_is_streaming() {
+        let mut c = Crc::new();
+        c.update(b"hello");
+        c.update(b" ");
+        c.update(b"world");
+
+        assert_eq!(c.amount(), 11);
+        assert_eq!(c.sum(), sum_of(b"hello world"));
+    }
+
+    #[test]
+    fn reset_restores_initial_state() {
+        let mut c = Crc::new();
+        c.update(b"abc");
+        assert_ne!(c.sum(), 0);
+        assert_eq!(c.amount(), 3);
+
+        c.reset();
+        assert_eq!(c.amount(), 0);
+        assert_eq!(c.sum(), 0);
+    }
+
+    #[test]
+    fn combine_matches_concatenation() {
+        let a = b"hello ";
+        let b = b"world";
+
+        let mut ca = crc_of(a);
+        let cb = crc_of(b);
+
+        ca.combine(&cb);
+
+        dbg!(&ca);
+
+        assert_eq!(ca.amount(), 11);
+        assert_eq!(ca.sum(), sum_of(b"hello world"));
+    }
+}