Fix some missed places that were using the old API, bump Rust version to allow use of if let guards

Author: eira-fransham

Cargo.toml

@@ -123,7 +123,7 @@ homepage = "https://slint.dev"
 keywords = ["gui", "toolkit", "graphics", "design", "ui"]
 license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0"
 repository = "https://github.com/slint-ui/slint"
-rust-version = "1.92"
+rust-version = "1.95"
 version = "1.17.0"
 
 [workspace.dependencies]

internal/core/graphics/image.rs

@@ -878,8 +878,13 @@ impl Image {
     ///         as new major WGPU releases become available.
     #[cfg(feature = "unstable-wgpu-27")]
     pub fn to_wgpu_27_texture(&self) -> Option<wgpu_27::Texture> {
+        #[cfg_attr(not(feature = "unstable-wgpu-28"), expect(irrefutable_let_patterns))]
         match &self.0 {
-            ImageInner::WGPUTexture(WGPUTexture::WGPU27Texture(texture)) => Some(texture.clone()),
+            ImageInner::WGPUTexture(texture_rc)
+                if WGPUTexture::WGPU27Texture(texture) = &**texture_rc =>
+            {
+                Some(texture.clone())
+            }
             _ => None,
         }
     }

internal/core/graphics/wgpu_27.rs

@@ -130,7 +130,7 @@ pub mod api {
                 return Err(Self::Error::InvalidUsage);
             }
             Ok(Self(super::super::ImageInner::WGPUTexture(
-                super::super::WGPUTexture::WGPU27Texture(texture),
+                super::super::WGPUTexture::WGPU27Texture(texture).into(),
             )))
         }
     }

tests/cases/issues/issue_2608_canon_img_path.slint

@@ -20,10 +20,16 @@ let img1_inner: &ImageInner = (&img1).into();
 let img2_inner: &ImageInner = (&img2).into();
 
 match (img1_inner, img2_inner) {
-    (ImageInner::EmbeddedImage { cache_key: ImageCacheKey::Path(img1_path), .. }, ImageInner::EmbeddedImage { cache_key: ImageCacheKey::Path(img2_path), .. }) => {
+    (ImageInner::EmbeddedImage(img1), ImageInner::EmbeddedImage(img2))
+        if let ImageCacheKey::Path(img1_path) = &img1.cache_key
+            && let ImageCacheKey::Path(img2_path) = &img2.cache_key =>
+    {
         assert_eq!(img1_path, img2_path)
     },
-    (ImageInner::EmbeddedImage { cache_key: ImageCacheKey::EmbeddedData(img1_addr), .. }, ImageInner::EmbeddedImage { cache_key: ImageCacheKey::EmbeddedData(img2_addr), .. }) => {
+    (ImageInner::EmbeddedImage(img1), ImageInner::EmbeddedImage(img2))
+        if let ImageCacheKey::EmbeddedData(img1_addr) = &img1.cache_key
+            && let ImageCacheKey::EmbeddedData(img2_addr) = &img2.cache_key =>
+    {
         assert_eq!(img1_addr, img2_addr)
     },
     _ => todo!("adjust this test to new image comparison"),