Merge pull request #1014 from peterdelevoryas/main

➕ zb,zv: Add camino feature to impl `Type` for utf-8 path types
dbus2 · Sep 23, 2024 · be53edb · be53edb
2 parents 9fc6c2b + 864e9c5
commit be53edb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zbus/Cargo.toml b/zbus/Cargo.toml
@@ -21,6 +21,7 @@ chrono = ["zvariant/chrono"]
 heapless = ["zvariant/heapless"]
 # Enables ser/de of `Option<T>` as an array of 0 or 1 elements.
 option-as-array = ["zvariant/option-as-array"]
+camino = ["zvariant/camino"]
 # Enables API that is only needed for bus implementations (enables `p2p`).
 bus-impl = ["p2p"]
 # Enables API that is only needed for peer-to-peer (p2p) connections.

diff --git a/zvariant/Cargo.toml b/zvariant/Cargo.toml
@@ -19,6 +19,7 @@ gvariant = ["zvariant_derive/gvariant", "zvariant_utils/gvariant"]
 ostree-tests = ["gvariant"]
 # Enables ser/de of `Option<T>` as an array of 0 or 1 elements.
 option-as-array = []
+camino = ["dep:camino"]
 
 [dependencies]
 zvariant_derive = { version = "=4.2.0", path = "../zvariant_derive" }
@@ -39,6 +40,7 @@ chrono = { version = "0.4.38", features = [
     "serde",
 ], default-features = false, optional = true }
 heapless = { version = "0.8.0", features = ["serde"], optional = true }
+camino = { version = "1.1.9", optional = true }
 
 [dev-dependencies]
 serde_json = "1.0.116"

diff --git a/zvariant/src/type.rs b/zvariant/src/type.rs
@@ -568,6 +568,11 @@ macro_rules! static_str_type {
 static_str_type!(Path);
 static_str_type!(PathBuf);
 
+#[cfg(feature = "camino")]
+static_str_type!(camino::Utf8Path);
+#[cfg(feature = "camino")]
+static_str_type!(camino::Utf8PathBuf);
+
 #[cfg(feature = "uuid")]
 impl_type_with_repr! {
     uuid::Uuid => &[u8] {