🚸 zv: Make signature parameter generic

zbus/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zbus"
 version = "4.0.0"
 authors = ["Zeeshan Ali Khan <[email protected]>"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64"
 
 description = "API for D-Bus communication"

zbus/src/match_rule/mod.rs

@@ -29,7 +29,6 @@ pub use builder::Builder;
 /// ```
 /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
 /// # use zbus::MatchRule;
-/// use std::convert::TryFrom;
 ///
 /// // Let's take the most typical example of match rule to subscribe to properties' changes:
 /// let rule = MatchRule::builder()

zbus_macros/Cargo.toml

@@ -6,7 +6,7 @@ authors = [
     "Marc-André Lureau <[email protected]>",
     "Zeeshan Ali Khan <[email protected]>",
 ]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64"
 
 description = "proc-macros for zbus"

zbus_macros/src/iface.rs

@@ -339,7 +339,7 @@ pub fn expand(args: AttributeArgs, mut input: ItemImpl) -> syn::Result<TokenStre
                 p.ty = Some(get_property_type(output)?);
                 p.read = true;
                 let inner = if is_fallible_property {
-                    quote!(self.#ident()#method_await#handle_fallible_property)
+                    quote!(self.#ident() #method_await #handle_fallible_property)
                 } else {
                     quote!(::std::result::Result::Ok(
                         ::std::convert::Into::into(

zbus_macros/src/proxy.rs

@@ -567,7 +567,7 @@ fn gen_proxy_method_call(
     if let Some(proxy_name) = proxy_object {
         let proxy = Ident::new(&proxy_name, Span::call_site());
         let signature = quote! {
-            fn #method#ty_generics(#inputs) -> #zbus::Result<#proxy<'c>>
+            fn #method #ty_generics(#inputs) -> #zbus::Result<#proxy<'c>>
             #where_clause
         };
 
@@ -602,7 +602,7 @@ fn gen_proxy_method_call(
 
         let output = &m.sig.output;
         let signature = quote! {
-            fn #method#ty_generics(#inputs) #output
+            fn #method #ty_generics(#inputs) #output
             #where_clause
         };
 
@@ -736,7 +736,7 @@ fn gen_proxy_property(
                 );
                 quote! {
                     #[doc = #gen_doc]
-                    pub #usage fn #receive#ty_generics(
+                    pub #usage fn #receive #ty_generics(
                         &self
                     ) -> #prop_stream<'c, <#ret_type as #zbus::ResultAdapter>::Ok>
                     #where_clause
@@ -1001,7 +1001,7 @@ fn gen_proxy_signal(
         quote! {
             impl #signal_name_ident {
                 /// Retrieve the signal arguments.
-                pub fn args#ty_generics(&'s self) -> #zbus::Result<#signal_args #ty_generics>
+                pub fn args #ty_generics(&'s self) -> #zbus::Result<#signal_args #ty_generics>
                 #where_clause
                 {
                     ::std::convert::TryFrom::try_from(&**self)

zbus_names/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zbus_names"
 version = "3.0.0"
 authors = ["Zeeshan Ali Khan <[email protected]>"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64"
 
 description = "A collection of D-Bus bus names types"

zbus_names/src/bus_name.rs

@@ -16,7 +16,6 @@ use zvariant::{NoneValue, OwnedValue, Str, Type, Value};
 /// # Examples
 ///
 /// ```
-/// use core::convert::TryFrom;
 /// use zbus_names::BusName;
 ///
 /// // Valid well-known names.

zbus_names/src/error_name.rs

@@ -17,7 +17,6 @@ use zvariant::{NoneValue, OwnedValue, Str, Type, Value};
 /// # Examples
 ///
 /// ```
-/// use core::convert::TryFrom;
 /// use zbus_names::ErrorName;
 ///
 /// // Valid error names.

zbus_names/src/interface_name.rs

@@ -15,7 +15,6 @@ use zvariant::{NoneValue, OwnedValue, Str, Type, Value};
 /// # Examples
 ///
 /// ```
-/// use core::convert::TryFrom;
 /// use zbus_names::InterfaceName;
 ///
 /// // Valid interface names.

zbus_names/src/member_name.rs

@@ -15,7 +15,6 @@ use zvariant::{NoneValue, OwnedValue, Str, Type, Value};
 /// # Examples
 ///
 /// ```
-/// use core::convert::TryFrom;
 /// use zbus_names::MemberName;
 ///
 /// // Valid member names.

zbus_names/src/unique_name.rs

@@ -15,7 +15,6 @@ use zvariant::{NoneValue, OwnedValue, Str, Type, Value};
 /// # Examples
 ///
 /// ```
-/// use core::convert::TryFrom;
 /// use zbus_names::UniqueName;
 ///
 /// // Valid unique names.

zbus_names/src/well_known_name.rs

@@ -15,7 +15,6 @@ use zvariant::{NoneValue, OwnedValue, Str, Type, Value};
 /// # Examples
 ///
 /// ```
-/// use core::convert::TryFrom;
 /// use zbus_names::WellKnownName;
 ///
 /// // Valid well-known names.

zbus_polkit/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zbus_polkit"
 version = "3.0.1"
 authors = ["Marc-André Lureau <[email protected]>"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64"
 
 description = "PolicyKit binding"

zbus_xmlgen/Cargo.toml

@@ -9,7 +9,7 @@ authors = [
     "Tim Small <[email protected]>",
     "Zeeshan Ali Khan <[email protected]>",
 ]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64"
 
 description = "D-Bus XML interface code generator"

zvariant/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zvariant"
 version = "4.0.0"
 authors = ["Zeeshan Ali Khan <[email protected]>"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64"
 
 description = "D-Bus & GVariant encoding & decoding"

zvariant/fuzz/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zvariant-fuzz"
 version = "0.0.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true

zvariant/src/dbus/de.rs

@@ -29,16 +29,21 @@ where
     /// Create a Deserializer struct instance.
     ///
     /// On Windows, there is no `fds` argument.
-    pub fn new<'r: 'de>(
+    pub fn new<'r: 'de, S>(
         bytes: &'r [u8],
         #[cfg(unix)] fds: Option<&'f [RawFd]>,
-        signature: &Signature<'sig>,
+        signature: S,
         ctxt: EncodingContext<B>,
-    ) -> Self {
+    ) -> Result<Self>
+    where
+        S: TryInto<Signature<'sig>>,
+        S::Error: Into<Error>,
+    {
         assert_eq!(ctxt.format(), EncodingFormat::DBus);
 
-        let sig_parser = SignatureParser::new(signature.clone());
-        Self(crate::DeserializerCommon {
+        let signature = signature.try_into().map_err(Into::into)?;
+        let sig_parser = SignatureParser::new(signature);
+        Ok(Self(crate::DeserializerCommon {
             ctxt,
             sig_parser,
             bytes,
@@ -49,7 +54,7 @@ where
             pos: 0,
             container_depths: Default::default(),
             b: PhantomData,
-        })
+        }))
     }
 }
 

zvariant/src/dbus/ser.rs

@@ -31,16 +31,21 @@ where
     /// Create a D-Bus Serializer struct instance.
     ///
     /// On Windows, there is no `fds` argument.
-    pub fn new<'w: 'ser, 'f: 'ser>(
-        signature: &Signature<'sig>,
+    pub fn new<'w: 'ser, 'f: 'ser, S>(
+        signature: S,
         writer: &'w mut W,
         #[cfg(unix)] fds: &'f mut Vec<RawFd>,
         ctxt: EncodingContext<B>,
-    ) -> Self {
+    ) -> Result<Self>
+    where
+        S: TryInto<Signature<'sig>>,
+        S::Error: Into<Error>,
+    {
         assert_eq!(ctxt.format(), EncodingFormat::DBus);
 
-        let sig_parser = SignatureParser::new(signature.clone());
-        Self(crate::SerializerCommon {
+        let signature = signature.try_into().map_err(Into::into)?;
+        let sig_parser = SignatureParser::new(signature);
+        Ok(Self(crate::SerializerCommon {
             ctxt,
             sig_parser,
             writer,
@@ -50,7 +55,7 @@ where
             value_sign: None,
             container_depths: Default::default(),
             b: PhantomData,
-        })
+        }))
     }
 }