fixup

Author: Frando

irpc-derive/src/lib.rs

@@ -309,7 +309,7 @@ pub fn rpc_requests(attr: TokenStream, item: TokenStream) -> TokenStream {
                 Err(e) => return e.to_compile_error().into(),
             };
 
-            match generate_channels_impl(args, &service_name, request_type, attr.span()) {
+            match generate_channels_impl(args, service_name, request_type, attr.span()) {
                 Ok(impls) => channel_impls.push(impls),
                 Err(e) => return e.to_compile_error().into(),
             }
@@ -322,7 +322,7 @@ pub fn rpc_requests(attr: TokenStream, item: TokenStream) -> TokenStream {
     // Generate type aliases if requested
     let type_aliases = if let Some(suffix) = alias_suffix {
         // Use all variants for type aliases, not just those with rpc attributes
-        generate_type_aliases(&all_variants, &service_name, &suffix)
+        generate_type_aliases(&all_variants, service_name, &suffix)
     } else {
         quote! {}
     };
@@ -358,11 +358,11 @@ pub fn rpc_requests(attr: TokenStream, item: TokenStream) -> TokenStream {
         let message_from_impls = generate_message_enum_from_impls(
             &message_enum_name,
             &variants_with_attr,
-            &service_name,
+            service_name,
         );
 
         let message_from_quic_streams =
-            generate_message_from_wire_impl(&message_enum_name, &enum_name, &variants_with_attr);
+            generate_message_from_wire_impl(&message_enum_name, enum_name, &variants_with_attr);
 
         quote! {
             #message_enum

irpc-iroh/src/lib.rs

@@ -146,10 +146,7 @@ pub async fn read_request<S: RemoteService>(
     connection: &Connection,
 ) -> std::io::Result<Option<S::Message>> {
     Ok(
-        match read_request_raw::<S::WireMessage>(connection).await? {
-            None => None,
-            Some((msg, rx, tx)) => Some(S::from_wire(msg, rx, tx)),
-        },
+        read_request_raw::<S::WireMessage>(connection).await?.map(|(msg, rx, tx)| S::from_wire(msg, rx, tx)),
     )
 }
 

src/lib.rs

@@ -1110,7 +1110,7 @@ impl<S: Service> From<tokio::sync::mpsc::Sender<S::Message>> for LocalSender<S>
 
 #[cfg(not(feature = "rpc"))]
 pub mod rpc {
-    pub struct RemoteSender<S>(std::marker::PhantomData<(R, S)>);
+    pub struct RemoteSender<S>(std::marker::PhantomData<S>);
 }
 
 #[cfg(feature = "rpc")]
@@ -1664,10 +1664,7 @@ pub mod rpc {
         connection: &quinn::Connection,
     ) -> std::io::Result<Option<S::Message>> {
         Ok(
-            match read_request_raw::<S::WireMessage>(connection).await? {
-                None => None,
-                Some((msg, rx, tx)) => Some(S::from_wire(msg, rx, tx)),
-            },
+            read_request_raw::<S::WireMessage>(connection).await?.map(|(msg, rx, tx)| S::from_wire(msg, rx, tx)),
         )
     }