Merge branch '1Password:master' into noel/add-wait-until

.github/workflows/test.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   rustfmt:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
@@ -91,3 +91,10 @@ jobs:
 
       - name: Check soundness
         run: cargo miri test windows --features image-data
+
+  semver:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Check semver
+      uses: obi1kenobi/cargo-semver-checks-action@v2

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.3.2 on 2024-12-02
+
+### Fixed
+- Fixed compilation on Windows when using the `image-data` feature combined with older Rust compilers.
+
 ## 3.3.1 on 2024-12-02
 
 ### Changed

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "arboard"
-version = "3.3.1"
+version = "3.3.2"
 authors = ["Artur Kovacs <kovacs.artur.barnabas@gmail.com>", "Avi Weinstock <aweinstock314@gmail.com>", "Arboard contributors"]
 description = "Image and text handling for the OS clipboard."
 repository = "https://github.com/1Password/arboard"
@@ -37,13 +37,13 @@ objc = "0.2"
 objc_id = "0.1"
 objc-foundation = "0.1"
 core-graphics = { version = "0.23", optional = true }
-image = { version = "0.24", optional = true, default-features = false, features = ["tiff"] }
+image = { version = "0.25", optional = true, default-features = false, features = ["tiff"] }
 
 [target.'cfg(all(unix, not(any(target_os="macos", target_os="android", target_os="emscripten"))))'.dependencies]
 log = "0.4"
 x11rb = { version = "0.13" }
 wl-clipboard-rs = { version = "0.8", optional = true }
-image = { version = "0.24", optional = true, default-features = false, features = ["png"] }
+image = { version = "0.25", optional = true, default-features = false, features = ["png"] }
 parking_lot = "0.12"
 
 [[example]]

src/common.rs

@@ -167,6 +167,9 @@ impl<F: FnOnce()> Drop for ScopeGuard<F> {
 
 /// Common trait for sealing platform extension traits.
 pub(crate) mod private {
+	// This is currently unused on macOS, so silence the warning which appears
+	// since there's no extension traits making use of this trait sealing structure.
+	#[cfg_attr(target_vendor = "apple", allow(unreachable_pub))]
 	pub trait Sealed {}
 
 	impl Sealed for crate::Get<'_> {}

src/lib.rs

@@ -7,6 +7,7 @@ The project to which this file belongs is licensed under either of
 the Apache 2.0 or the MIT license at the licensee's choice. The terms
 and conditions of the chosen license apply to this file.
 */
+#![warn(unreachable_pub)]
 
 mod common;
 use std::borrow::Cow;

src/platform/linux/mod.rs

@@ -31,7 +31,7 @@ fn encode_as_png(image: &ImageData) -> Result<Vec<u8>, Error> {
 			image.bytes.as_ref(),
 			image.width as u32,
 			image.height as u32,
-			image::ColorType::Rgba8,
+			image::ExtendedColorType::Rgba8,
 		)
 		.map_err(|_| Error::ConversionFailure)?;
 

src/platform/windows.rs

@@ -37,7 +37,10 @@ mod image_data {
 		Error::unknown(format!("{}: {}", message, os_error))
 	}
 
-	pub fn add_cf_dibv5(_open_clipboard: OpenClipboard, image: ImageData) -> Result<(), Error> {
+	pub(super) fn add_cf_dibv5(
+		_open_clipboard: OpenClipboard,
+		image: ImageData,
+	) -> Result<(), Error> {
 		// This constant is missing in windows-rs
 		// https://github.com/microsoft/windows-rs/issues/2711
 		#[allow(non_upper_case_globals)]
@@ -137,7 +140,7 @@ mod image_data {
 		}
 	}
 
-	pub fn read_cf_dibv5(dibv5: &[u8]) -> Result<ImageData<'static>, Error> {
+	pub(super) fn read_cf_dibv5(dibv5: &[u8]) -> Result<ImageData<'static>, Error> {
 		// The DIBV5 format is a BITMAPV5HEADER followed by the pixel data according to
 		// https://docs.microsoft.com/en-us/windows/win32/dataxchg/standard-clipboard-formats