html-to-markdown 2.25.1 → 2.26.2

data/rust-vendor/regex-syntax/src/hir/translate.rs

@@ -1047,7 +1047,7 @@ impl<'t, 'p> TranslatorI<'t, 'p> {
         if let Ok(ref mut class) = result {
             self.unicode_fold_and_negate(
                 &ast_class.span,
-                ast_class.negated,
+                ast_class.is_negated(),
                 class,
             )?;
         }
@@ -2470,6 +2470,10 @@ mod tests {
             t(r"\p{gc=Separator}"),
             hir_uclass_query(ClassQuery::Binary("Z"))
         );
+        assert_eq!(
+            t(r"\p{gc!=Separator}"),
+            hir_negate(hir_uclass_query(ClassQuery::Binary("Z")))
+        );
         assert_eq!(
             t(r"\p{Other}"),
             hir_uclass_query(ClassQuery::Binary("Other"))
@@ -2486,7 +2490,7 @@ mod tests {
         );
         assert_eq!(
             t(r"\P{gc!=separator}"),
-            hir_negate(hir_uclass_query(ClassQuery::Binary("Z")))
+            hir_uclass_query(ClassQuery::Binary("Z"))
         );
 
         assert_eq!(t(r"\p{any}"), hir_uclass_query(ClassQuery::Binary("Any")));

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

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"95011466f65a672b5efccd6d8135f5e4540fa31f8694e6d12d48a962caa9cae3","Cargo.lock":"8a3d73549ab0285287dfa562af1bebd32ecd55e5911bf26f3e56217ba8b7ed2b","Cargo.toml":"30cd97165651f8bad01c0cde99b15a7260294f2a7ee231d2c8e9aa1fb9221fe6","Cargo.toml.orig":"72bd11f3af192108a5c0fe0b841fabcd717b9d32dd4981d79b464af540918fa5","LICENSE":"457b464bc0fba8a3d67d2458569104f5611869f0c1563a1a12d9c51a0bca9261","README.md":"b69a452a62f1d85cc25581feca75d9b3fc154d48cafdc248c8df5b8049ed2c8c","examples/example.rs":"c69042b49b60a486e249b9292ed9d59b06b8845873c5837910251172078e6083","examples/serde.rs":"7d2c63d0d9892d22a37a8fbc56e3f9860573a0454ebd15302b40a0f9984cf6e8","src/as_bytes.rs":"6a7291f2baebb1ff16b6644e325b7b48ae6b8a3a30348f70391227d4c6fac508","src/bytemuck_impl.rs":"6164ab623525b2803491c2941f824602bbec4c91ebf3955e1064a0320d8fe4ad","src/formats/abgr.rs":"b1b854400c4688808b09f2710181da63d50a1121fdfd736658963506595e2507","src/formats/argb.rs":"c11f6ba738c80a285c1b99ca746efeccea7938f8fd6dcbfb4a197bb7c6896382","src/formats/bgr.rs":"1cfcc068bbadbf5764672ebc1a73ce53d8c6312579589dd4f251251f018f2929","src/formats/bgra.rs":"29d4e597eb62dea123686d8bca4467cdb817a2d0aaae6d22ebaee0a9d172a57e","src/formats/gray.rs":"ed89fc396ae8e7453239dd63ac6ed476195ae96d97da86f4a10f92b8ec74ce45","src/formats/gray_a.rs":"8db0f5f55554497119fcbeab59bf74dbc60363d2ff996c65b2a7ee0deed29ccc","src/formats/gray_alpha.rs":"55eaff8c6fa3af38740a8bbcc25c8eb33f114262b913104ab3b5d4272b775561","src/formats/grb.rs":"13cf52ed06694c25f0393ae590f9ec33097dd020c45a0d2fb07ba820a5d19e34","src/formats/rgb.rs":"80510978bd421a79dd07f22aa572afdfd7c3fd199d53b98a3fedaf0056d08c1d","src/formats/rgba.rs":"4025fb76ec59984bc3abe7f296f099c7050aca0291ce1b5196d386aa28436653","src/inherent_impls.rs":"3e31884df3b62b6f3fa926a36fc0cc9aee55986575c9f30a5ffea81b46d14f04","src/legacy/alt.rs":"6472b33b23bd20ea39c9f24666b44a7ff47d8eb431466accecd5d9388d53578b","src/legacy/internal/convert/array.rs":"c56f532bde4b269bb512733192bb4176a9d5c2a83d505b522f769795853c4ed9","src/legacy/internal/convert/mod.rs":"b12ca3ea2c2f3e90b20bc6e6aab9db31c5c548d09ae6147ec7de8a13d8607317","src/legacy/internal/convert/tuple.rs":"4b4e118c939d8f0b472ea0c0736ece61c70a30d8cf384645262634ae94e30704","src/legacy/internal/ops.rs":"a28cda8cd2217a2b7f80b57727183275e54e8aac1ce8be0cb0737727c14aba0d","src/legacy/internal/pixel.rs":"049612c33a2e9b401ca4cfe364c090a4c1bdd05086cf5f0b3907c434fc4ee9ea","src/legacy/internal/rgb.rs":"b1315f3c7ea9272a45efe9f8648cb7ca1327686424f53e78b77a31d5b674f897","src/legacy/internal/rgba.rs":"ad18c35644be08d2bfac713121cbfb30b91d68f10d3955b939ff88be9ae19ba3","src/lib.rs":"0d5b569e9ff56aef7d87b80003471b80720016e12a8222f3821ea60e65436110"},"package":"0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"}
+{"files":{".cargo_vcs_info.json":"61a1a15e45804bb12e3c4d268f12566bb7d8bd6cf0cc21b48029d48e30007775","Cargo.lock":"624805027211526896aedfed31ae9974e5a8566aece290cde02124a1a72faed4","Cargo.toml":"b4f54a7ad19733e2a1057ac33221a65c9fa2f1cd902cebeeaf57a98fefd276a4","Cargo.toml.orig":"82ccb4c51694616bc87e24a92c7dd35d14e8f93be4245db1e4f0232db45de004","LICENSE":"457b464bc0fba8a3d67d2458569104f5611869f0c1563a1a12d9c51a0bca9261","README.md":"b69a452a62f1d85cc25581feca75d9b3fc154d48cafdc248c8df5b8049ed2c8c","examples/example.rs":"c9eaf173200d1a0bdb59ef55780d97b689f6ac34acfef9b85770374282e038c1","examples/serde.rs":"7d2c63d0d9892d22a37a8fbc56e3f9860573a0454ebd15302b40a0f9984cf6e8","src/as_bytes.rs":"8844bae0d5c2dc6d407ceea684b596cf729c01c3c9f7413c9b79b336b62d27eb","src/bytemuck_impl.rs":"6164ab623525b2803491c2941f824602bbec4c91ebf3955e1064a0320d8fe4ad","src/formats/abgr.rs":"b1b854400c4688808b09f2710181da63d50a1121fdfd736658963506595e2507","src/formats/argb.rs":"c11f6ba738c80a285c1b99ca746efeccea7938f8fd6dcbfb4a197bb7c6896382","src/formats/bgr.rs":"1cfcc068bbadbf5764672ebc1a73ce53d8c6312579589dd4f251251f018f2929","src/formats/bgra.rs":"29d4e597eb62dea123686d8bca4467cdb817a2d0aaae6d22ebaee0a9d172a57e","src/formats/gray.rs":"771c715be85b8f980a273868bbfe7b2f61dbe1927a6e0527f9903d6ddd5ec5b9","src/formats/gray_a.rs":"8db0f5f55554497119fcbeab59bf74dbc60363d2ff996c65b2a7ee0deed29ccc","src/formats/gray_alpha.rs":"55eaff8c6fa3af38740a8bbcc25c8eb33f114262b913104ab3b5d4272b775561","src/formats/grb.rs":"13cf52ed06694c25f0393ae590f9ec33097dd020c45a0d2fb07ba820a5d19e34","src/formats/rgb.rs":"80510978bd421a79dd07f22aa572afdfd7c3fd199d53b98a3fedaf0056d08c1d","src/formats/rgba.rs":"4025fb76ec59984bc3abe7f296f099c7050aca0291ce1b5196d386aa28436653","src/inherent_impls.rs":"3e31884df3b62b6f3fa926a36fc0cc9aee55986575c9f30a5ffea81b46d14f04","src/legacy/alt.rs":"37bf5a2267c2a068c4f0451447734257ceb0625e20538ac06d57a294db44849f","src/legacy/internal/convert/array.rs":"4ab79a3c8ea7bd59d328825aa1768cf1ed390e762fb65cc384df33f8a1962a0f","src/legacy/internal/convert/mod.rs":"67ee84d72974d9338198a6e50e1986db751c36c2b7c5d164559353b48d347771","src/legacy/internal/convert/tuple.rs":"ebfc77ed4086356f9943e6074568bdb0545f5db9f6ae02237c657ca0eedff181","src/legacy/internal/ops.rs":"1aeaf0fff250f887a047089e14f925994e051a4a187a177742502925fec0e1e0","src/legacy/internal/pixel.rs":"da40a9f826b220a6aee7628d920a9cc797a8fb3223ec7655f873026824ecdcde","src/legacy/internal/rgb.rs":"29375d0faa447a60914d7662f4ea1076454e8ad4d88e05fa331592cb014023ec","src/legacy/internal/rgba.rs":"b05f04d85f3da49df4716450907bf4db7a25f0687a43128c6ea6920476c44d27","src/lib.rs":"49fe05c59a2b4af883f90d95929360ac9cadfab5a945176b65d9c7617ea870c4"},"package":"47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"}

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

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "39276d5e2161a6c85cde118cd928559894d66ec1"
+    "sha1": "f453adedbbd1a672c654239b0eb0576de606d7d2"
   },
   "path_in_vcs": ""
 }

data/rust-vendor/rgb/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "bitflags"
@@ -10,9 +10,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.1"
+version = "1.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
+checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
 
 [[package]]
 name = "defmt"
@@ -91,9 +91,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.52"
+version = "0.8.53"
 dependencies = [
  "bytemuck",
  "defmt 0.3.100",
@@ -125,18 +125,28 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.225"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.225"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.225"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -145,21 +155,22 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,18 +179,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -188,6 +199,6 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"

data/rust-vendor/rgb/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.64"
 name = "rgb"
-version = "0.8.52"
+version = "0.8.53"
 authors = [
     "Kornel Lesiński <kornel@geekhood.net>",
     "James Forster <james.forsterer@gmail.com>",

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

@@ -1,6 +1,6 @@
 [package]
 name = "rgb"
-version = "0.8.52"
+version = "0.8.53"
 authors = ["Kornel Lesiński <kornel@geekhood.net>", "James Forster <james.forsterer@gmail.com>"]
 include = ["src/**/*", "Cargo.toml", "README.md", "examples/*.rs", "LICENSE"]
 description = "`struct RGB/RGBA/etc.` for sharing pixels between crates + convenience methods for color manipulation.\nAllows no-copy high-level interoperability. Also adds common convenience methods and implements standard Rust traits to make `RGB`/`RGBA` pixels and slices first-class Rust objects."

data/rust-vendor/rgb/examples/example.rs

@@ -1,6 +1,4 @@
-#[cfg(feature = "as-bytes")]
 fn main() {
-    use rgb::ComponentSlice;
     use rgb::prelude::*;
     use rgb::Rgb;
 
@@ -9,20 +7,11 @@ fn main() {
         g: 0,
         b: 100,
     };
+    #[cfg(feature = "bytemuck")]
     assert_eq!(rgb::bytemuck::cast_slice::<_, u8>(&[px])[0], 255);
 
-    let bigpx = Rgb::<u16> {
-        r: 65535_u16,
-        g: 0,
-        b: 0,
-    };
-    assert_eq!(bigpx.as_slice()[0], 65535);
-
     let px = Rgb::<u8>::new(255, 0, 255);
     let inverted: Rgb<u8> = px.map(|ch| 255 - ch);
 
     println!("{inverted}"); // rgb(0,255,0)
 }
-
-#[cfg(not(feature = "as-bytes"))]
-fn main() {}

data/rust-vendor/rgb/src/as_bytes.rs

@@ -115,24 +115,3 @@ impl<T: crate::Pod> ComponentBytes<T> for [Gray<T>] {}
 #[cfg(feature = "as-bytes")]
 impl<T: crate::Pod> ComponentBytes<T> for [GrayAlpha<T>] {}
 
-#[test]
-#[allow(dead_code)]
-fn shared_impl() {
-    struct SharedPixelBuffer<Pixel> {
-        data: [Pixel; 1],
-    }
-
-    impl<Pixel: Clone + crate::Pod> SharedPixelBuffer<Pixel>
-    where
-        [Pixel]: crate::ComponentBytes<u8>,
-    {
-        pub fn as_bytes(&self) -> &[u8] {
-            self.data.as_slice().as_bytes()
-        }
-    }
-
-    let b = SharedPixelBuffer {
-        data: [crate::RGB8::new(0,0,0)],
-    };
-    let _ = b.as_bytes();
-}

data/rust-vendor/rgb/src/formats/gray.rs

@@ -10,7 +10,7 @@ pub struct Gray_v08<T>(
     pub T,
 );
 
-impl<T: Copy> Gray_v08<T> {
+impl<T: Clone> Gray_v08<T> {
     /// Reads the `.0` field
     ///
     /// This function isn't necessary, but it is forwards-compatible with the next major version of the RGB crate.
@@ -70,7 +70,7 @@ impl<T> core::ops::Deref for Gray_v08<T> {
 }
 
 #[cfg(feature = "unstable-experimental")]
-impl<T: Copy> Gray_v09<T> {
+impl<T: Clone> Gray_v09<T> {
     /// Reads the `.v` field
     ///
     /// This function isn't necessary, but it is forwards-compatible with the next major version of the RGB crate.
@@ -93,6 +93,7 @@ impl<T: Copy> Gray_v09<T> {
 
 #[test]
 #[cfg(feature = "unstable-experimental")]
+#[allow(deprecated)]
 fn swizzle() {
     let g = Gray_v08(10u8);
     assert_eq!(10, g.v);

data/rust-vendor/rgb/src/legacy/alt.rs

@@ -1,4 +1,6 @@
-use crate::legacy::internal::pixel::{ComponentMap, ColorComponentMap, ComponentSlice};
+use crate::legacy::internal::pixel::{ComponentMap, ColorComponentMap};
+#[allow(deprecated)]
+use crate::legacy::internal::pixel::ComponentSlice;
 use core::slice;
 
 pub use crate::formats::gray::Gray_v08 as Gray;
@@ -170,6 +172,7 @@ impl<T: Copy, A: Copy, B> ColorComponentMap<GrayAlpha<B, A>, T, B> for GrayAlpha
     }
 }
 
+#[allow(deprecated)]
 impl<T> ComponentSlice<T> for GrayAlpha<T> {
     #[inline(always)]
     fn as_slice(&self) -> &[T] {
@@ -186,6 +189,7 @@ impl<T> ComponentSlice<T> for GrayAlpha<T> {
     }
 }
 
+#[allow(deprecated)]
 impl<T> ComponentSlice<T> for [GrayAlpha<T>] {
     #[inline]
     fn as_slice(&self) -> &[T] {
@@ -202,6 +206,7 @@ impl<T> ComponentSlice<T> for [GrayAlpha<T>] {
     }
 }
 
+#[allow(deprecated)]
 impl<T> ComponentSlice<T> for Gray<T> {
     #[inline(always)]
     #[allow(deprecated)]
@@ -216,6 +221,7 @@ impl<T> ComponentSlice<T> for Gray<T> {
     }
 }
 
+#[allow(deprecated)]
 impl<T> ComponentSlice<T> for [Gray<T>] {
     #[inline]
     fn as_slice(&self) -> &[T] {
@@ -249,53 +255,3 @@ impl<T: Copy> From<Gray<T>> for GrayAlpha<T, u16> {
         Self(other.0, 0xFFFF)
     }
 }
-
-#[test]
-#[allow(deprecated)]
-fn gray() {
-    let rgb: crate::RGB<_> = Gray(1).into();
-    assert_eq!(rgb.r, 1);
-    assert_eq!(rgb.g, 1);
-    assert_eq!(rgb.b, 1);
-
-    let rgba: crate::RGBA<_> = Gray(1u8).into();
-    assert_eq!(rgba.r, 1);
-    assert_eq!(rgba.g, 1);
-    assert_eq!(rgba.b, 1);
-    assert_eq!(rgba.a, 255);
-
-    let g: GRAY8 = 200.into();
-    let g = g.map(|c| c / 2);
-    #[cfg(not(feature = "unstable-experimental"))]
-    assert_eq!(110, *g + 10);
-    #[cfg(not(feature = "unstable-experimental"))]
-    assert_eq!(110, 10 + Gray(100).as_ref());
-
-    let ga: GRAYA8 = GrayAlpha(1, 2);
-    assert_eq!(ga.gray(), Gray::new(1));
-    let mut g2 = ga.clone();
-    *g2.gray_mut() = Gray(3);
-    assert_eq!(g2.map_gray(|g| g + 1), GRAYA8::new(4, 2));
-    assert_eq!(g2.map(|g| g + 1), GrayAlpha(4, 3));
-    assert_eq!(g2.0, 3);
-    assert_eq!(g2.as_slice(), &[3, 2]);
-    assert_eq!(g2.as_mut_slice(), &[3, 2]);
-    assert_eq!(g2.with_alpha(13), GrayAlpha(3, 13));
-    assert_eq!(g2.map_alpha(|x| x + 3), GrayAlpha(3, 5));
-
-    assert_eq!((&[Gray(1u16), Gray(2)][..]).as_slice(), &[1, 2]);
-    assert_eq!((&[GrayAlpha(1u16, 2), GrayAlpha(3, 4)][..]).as_slice(), &[1, 2, 3, 4]);
-
-    let rgba: crate::RGBA<_> = ga.into();
-    assert_eq!(rgba.r, 1);
-    assert_eq!(rgba.g, 1);
-    assert_eq!(rgba.b, 1);
-    assert_eq!(rgba.a, 2);
-
-    let ga: GRAYA16 = GrayAlpha(1, 2);
-    let rgba: crate::RGBA<u16, u16> = ga.into();
-    assert_eq!(rgba.r, 1);
-    assert_eq!(rgba.g, 1);
-    assert_eq!(rgba.b, 1);
-    assert_eq!(rgba.a, 2);
-}

data/rust-vendor/rgb/src/legacy/internal/convert/array.rs

@@ -94,19 +94,3 @@ impl<T> From<BGRA<T>> for [T; 4] {
         [value.b, value.g, value.r, value.a]
     }
 }
-
-#[test]
-#[allow(deprecated)]
-fn convert_array() {
-    use crate::alt::{BGR8, BGRA8};
-    use crate::{RGB8, RGBA8};
-
-    assert_eq!(RGB8::from([1, 2, 3]), RGB8::new(1, 2, 3));
-    assert_eq!(Into::<[u8; 3]>::into(RGB8::new(1, 2, 3)), [1, 2, 3]);
-    assert_eq!(RGBA8::from([1, 2, 3, 4]), RGBA8::new(1, 2, 3, 4));
-    assert_eq!(Into::<[u8; 4]>::into(RGBA8::new(1, 2, 3, 4)), [1, 2, 3, 4]);
-    assert_eq!(BGR8::from([3, 2, 1]), BGR8::new(1, 2, 3));
-    assert_eq!(Into::<[u8; 3]>::into(BGR8::new(1, 2, 3)), [3, 2, 1]);
-    assert_eq!(BGRA8::from([3, 2, 1, 4]), BGRA8::new(1, 2, 3, 4));
-    assert_eq!(Into::<[u8; 4]>::into(BGRA8::new(1, 2, 3, 4)), [3, 2, 1, 4]);
-}

data/rust-vendor/rgb/src/legacy/internal/convert/mod.rs

@@ -1,6 +1,8 @@
-use super::pixel::{ComponentSlice, ComponentMap};
-use crate::alt::{BGR, BGRA, GRB, Gray, GrayAlpha, ARGB, ABGR};
-use crate::{RGB, RGBA};
+#[allow(deprecated)]
+use super::pixel::ComponentSlice;
+use super::pixel::ComponentMap;
+use crate::alt::{BGR, BGRA, GRB, ARGB, ABGR};
+use crate::{RGB, RGBA, Gray, GrayAlpha};
 use core::{mem, slice};
 
 mod array;
@@ -286,9 +288,9 @@ impl<T: Clone> From<Gray<T>> for RGB<T> {
     #[allow(deprecated)]
     fn from(other: Gray<T>) -> Self {
         Self {
-            r: other.0.clone(),
-            g: other.0.clone(),
-            b: other.0,
+            r: other.clone().value(),
+            g: other.clone().value(),
+            b: other.value(),
         }
     }
 }
@@ -298,23 +300,23 @@ impl<T: Clone> From<Gray<T>> for RGBA<T, u8> {
     #[allow(deprecated)]
     fn from(other: Gray<T>) -> Self {
         Self {
-            r: other.0.clone(),
-            g: other.0.clone(),
-            b: other.0,
+            r: other.clone().value(),
+            g: other.clone().value(),
+            b: other.value(),
             a: 255,
         }
     }
 }
 
-impl<T: Clone, A> From<GrayAlpha<T, A>> for RGBA<T, A> {
+impl<T: Clone, A: Clone> From<GrayAlpha<T, A>> for RGBA<T, A> {
     #[inline(always)]
     #[allow(deprecated)]
     fn from(other: GrayAlpha<T, A>) -> Self {
         Self {
-            r: other.0.clone(),
-            g: other.0.clone(),
-            b: other.0,
-            a: other.1,
+            r: other.v.clone(),
+            g: other.v.clone(),
+            b: other.v.clone(),
+            a: other.a.clone(),
         }
     }
 }
@@ -332,7 +334,8 @@ impl<T> AsRef<T> for Gray<T> {
 impl<T> AsRef<[T]> for RGB<T> {
     #[inline(always)]
     fn as_ref(&self) -> &[T] {
-        self.as_slice()
+        #[allow(deprecated)]
+        ComponentSlice::as_slice(self)
     }
 }
 
@@ -347,7 +350,8 @@ impl<T> AsRef<[T; 3]> for RGB<T> {
 impl<T> AsRef<[T]> for RGBA<T> {
     #[inline(always)]
     fn as_ref(&self) -> &[T] {
-        self.as_slice()
+        #[allow(deprecated)]
+        ComponentSlice::as_slice(self)
     }
 }
 
@@ -405,7 +409,8 @@ impl<T> AsMut<T> for Gray<T> {
 impl<T> AsMut<[T]> for RGB<T> {
     #[inline(always)]
     fn as_mut(&mut self) -> &mut [T] {
-        self.as_mut_slice()
+        #[allow(deprecated)]
+        ComponentSlice::as_mut_slice(self)
     }
 }
 
@@ -420,7 +425,8 @@ impl<T> AsMut<[T; 3]> for RGB<T> {
 impl<T> AsMut<[T]> for RGBA<T> {
     #[inline(always)]
     fn as_mut(&mut self) -> &mut [T] {
-        self.as_mut_slice()
+        #[allow(deprecated)]
+        ComponentSlice::as_mut_slice(self)
     }
 }
 
@@ -446,59 +452,3 @@ impl<T> AsMut<[T; 2]> for GrayAlpha<T> {
         unsafe { &mut *(self as *mut Self).cast() }
     }
 }
-
-#[test]
-fn argb_converts() {
-    let argb = ARGB { a: 0xffu8, r: 0xfa, g: 0xfb, b: 0xfc };
-    let rgba = RGBA { a: 0xffu8, r: 0xfa, g: 0xfb, b: 0xfc };
-
-    assert_eq!(RGBA::from(argb), rgba);
-    assert_eq!(ARGB::from(rgba), argb);
-    assert_eq!(rgba.rgb(), argb.rgb());
-
-    let bgra = BGRA { a: 0xffu8, r: 0x1f, g: 0x2f, b: 0x3f };
-    let abgr = ABGR { a: 0xffu8, r: 0x1f, g: 0x2f, b: 0x3f };
-
-    assert_eq!(BGRA::from(abgr), bgra);
-    assert_eq!(ABGR::from(bgra), abgr);
-}
-
-#[test]
-fn converts() {
-    assert_eq!([1,2].as_gray(), [Gray::new(1), Gray::new(2)]);
-    assert_eq!([3].as_gray_mut(), [Gray::new(3)]);
-    assert_eq!([1,2].as_gray_alpha(), [GrayAlpha::new(1, 2)]);
-    // excess bytes are ignored
-    assert_eq!([1,2,3].as_gray_alpha_mut(), [GrayAlpha::new(1, 2)]);
-    assert_eq!([1,2,3,4].as_gray_alpha_mut(), [GrayAlpha::new(1, 2), GrayAlpha::new(3, 4)]);
-
-    assert_eq!(RGBA::new(1u8,2,3,255), RGB::new(1u8,2,3).into());
-    assert_eq!(RGBA::new(1u16,2,3,65535), RGB::new(1u16,2,3).into());
-    assert_eq!(BGRA{r:1u8,g:2u8,b:3u8,a:255u8}, BGR{r:1u8,g:2u8,b:3u8}.into());
-    assert_eq!(BGRA{r:1u8,g:2u8,b:3u8,a:255u8}, RGB{r:1u8,g:2u8,b:3u8}.into());
-    assert_eq!(RGBA {r:1u8,g:2,b:3,a:4u8}, BGRA{r:1u8,g:2u8,b:3u8,a:4u8}.into());
-    assert_eq!(BGR {r:1u8,g:2,b:3u8}, RGB {r:1u8,g:2,b:3u8}.into());
-    assert_eq!(RGB {r:1u16,g:0x5678,b:0xABCDu16}, BGR {r:1u16,g:0x5678,b:0xABCDu16}.into());
-    assert_eq!(BGR {r:0x1234567u32,g:2,b:3u32}, RGB {r:0x1234567u32,g:2,b:3u32}.into());
-
-    assert_eq!(&[1u8,2,3,4], RGBA {r:1u8,g:2,b:3,a:4u8}.as_slice());
-    assert_eq!(&[1u8,2,3,4], RGBA {r:1u8,g:2,b:3,a:4u8}.as_ref());
-    assert_eq!(&[1u8,2,3], RGB {r:1u8,g:2,b:3}.as_slice());
-    assert_eq!(&[1u8,2,3], RGB {r:1u8,g:2,b:3}.as_ref());
-
-    assert_eq!(&[1u8,2,3], RGB {r:1u8,g:2,b:3}.as_mut_slice());
-    assert_eq!(&[1u8,2,3], RGB {r:1u8,g:2,b:3}.as_mut());
-}
-
-
-#[test]
-#[cfg(feature = "unstable-experimental")]
-fn as_refs() {
-    let mut r = RGBA::new(1u8,2,3,4u8);
-    assert_eq!(&[1,2,3,4], AsRef::<[u8; 4]>::as_ref(&r));
-    assert_eq!([1,2,3,4], *AsMut::<[u8; 4]>::as_mut(&mut r));
-
-    let mut r = GrayAlpha::new(1u8,4u8);
-    assert_eq!(&[1,4], AsRef::<[u8; 2]>::as_ref(&r));
-    assert_eq!([1,4], *AsMut::<[u8; 2]>::as_mut(&mut r));
-}

data/rust-vendor/rgb/src/legacy/internal/convert/tuple.rs

@@ -74,12 +74,3 @@ tuple_conversion!(GrayA, 2, [v:0, a:1]);
 tuple_conversion!(Gray_v08, 1, [0:0]);
 tuple_conversion!(GrayAlpha, 2, [0:0, 1:1]);
 
-#[test]
-fn converts() {
-    assert_eq!((1,2,3), Rgb {r:1u8,g:2,b:3}.into());
-    assert_eq!(Rgb {r:1u8,g:2,b:3}, (1,2,3).into());
-    assert_eq!((1,2,3,4), Rgba {r:1,g:2,b:3,a:4}.into());
-    assert_eq!(Rgba {r:1u8,g:2,b:3,a:4}, (1,2,3,4).into());
-    assert_eq!(Bgra {r:1u8,g:2,b:3,a:4}, (3,2,1,4).into());
-    assert_eq!(Bgr {r:1u8,g:2,b:3}, (3,2,1).into());
-}