From 1c6c9c84e01787876769067181063f41edad8a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Laitl?= Date: Tue, 9 Apr 2024 15:51:24 +0200 Subject: [PATCH 1/2] Only enable the `deflate` feature of the `zip` dependency I got some unrelated build problems with `zstd-safe`, with `cameleon` pulling it to our dependencies. I then realized that the `zstd` compression isn't needed in cameleon. The GenICam GenTL 1.6 (PDF) spec says under 4.1.2 XML Description: > Supported formats are: > - Uncompressed XML description files > - Zip-compressed XML description files. The compression methods used are DEFLATE and STORE as described in RFC 1951. ...so only enable the `deflate` feature on `zip`. --- cameleon/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cameleon/Cargo.toml b/cameleon/Cargo.toml index d369f6e5..7046a7e0 100644 --- a/cameleon/Cargo.toml +++ b/cameleon/Cargo.toml @@ -18,7 +18,7 @@ keywords = ["genicam", "camera", "usb3", "gige", "uvc"] [dependencies] thiserror = "1.0.24" semver = "1.0.0" -zip = "0.6.0" +zip = { version = "0.6.0", default-features = false, features = ["deflate"] } sha-1 = "0.10.0" async-channel = "1.7.0" # 1.7.0 has added recv_blocking() tracing = "0.1.26" From af604abd6dc6c1bf8b3e9d72b6c7217d45c0a2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Laitl?= Date: Tue, 9 Apr 2024 15:59:41 +0200 Subject: [PATCH 2/2] Apply clippy 1.77 lint/suggestion --- gentl/src/ffi/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gentl/src/ffi/mod.rs b/gentl/src/ffi/mod.rs index e00f0717..8d7825a5 100644 --- a/gentl/src/ffi/mod.rs +++ b/gentl/src/ffi/mod.rs @@ -183,7 +183,7 @@ lazy_static::lazy_static! { } thread_local! { - static LAST_ERROR: RefCell = { + static LAST_ERROR: RefCell = const { let last_error = LastError { err: None, };