Fix docs on macro invocations

Author: Jethro Beekman

mbedtls/src/pk/mod.rs

@@ -315,8 +315,10 @@ impl Pk {
             .is_ok()
     }
 
-    /// Key length in bits
-    getter!(len() -> usize = fn pk_get_bitlen);
+    getter!(
+        /// Key length in bits
+        len() -> usize = fn pk_get_bitlen
+    );
     getter!(pk_type() -> Type = fn pk_get_type);
 
     pub fn curve(&self) -> Result<EcGroupId> {

mbedtls/src/ssl/config.rs

@@ -214,11 +214,15 @@ impl<'c> Config<'c> {
         };
     }
 
-    /// Client only: whether to remember and use session tickets
-    setter!(set_session_tickets(u: UseSessionTickets) = ssl_conf_session_tickets);
-
-    /// Client only: minimal FFDH group size
-    setter!(set_ffdh_min_bitlen(bitlen: c_uint) = ssl_conf_dhm_min_bitlen);
+    setter!(
+        /// Client only: whether to remember and use session tickets
+        set_session_tickets(u: UseSessionTickets) = ssl_conf_session_tickets
+    );
+
+    setter!(
+        /// Client only: minimal FFDH group size
+        set_ffdh_min_bitlen(bitlen: c_uint) = ssl_conf_dhm_min_bitlen
+    );
 
     // TODO: The lifetime restrictions on HandshakeContext here are too strict.
     // Once we need something else, we might fix it.

mbedtls/src/wrapper_macros.rs

@@ -227,7 +227,8 @@ macro_rules! define_struct {
 }
 
 macro_rules! setter {
-    { $rfn:ident($n:ident : $rty:ty) = $cfn:ident } => {
+    { $(#[$m:meta])* $rfn:ident($n:ident : $rty:ty) = $cfn:ident } => {
+        $(#[$m])*
         pub fn $rfn(&mut self, $n: $rty) {
             unsafe{::mbedtls_sys::$cfn(&mut self.inner,$n.into())}
         }
@@ -236,9 +237,10 @@ macro_rules! setter {
 
 // can't make this work without as as_XXX! macro, and there is no as_method!...
 macro_rules! setter_callback {
-    { $s:ident<$l:tt>::$rfn:ident($n:ident : $($rty:tt)+) = $cfn:ident } => {
+    { $(#[$m:meta])* $s:ident<$l:tt>::$rfn:ident($n:ident : $($rty:tt)+) = $cfn:ident } => {
         as_item!(
         impl<$l> $s<$l> {
+            $(#[$m])*
             pub fn $rfn<F: $($rty)+>(&mut self, $n: Option<&$l mut F>) {
                 unsafe{::mbedtls_sys::$cfn(
                     &mut self.inner,
@@ -252,12 +254,14 @@ macro_rules! setter_callback {
 }
 
 macro_rules! getter {
-    { $rfn:ident() -> $rty:ty = .$cfield:ident } => {
+    { $(#[$m:meta])* $rfn:ident() -> $rty:ty = .$cfield:ident } => {
+        $(#[$m])*
         pub fn $rfn(&self) -> $rty {
             self.inner.$cfield.into()
         }
     };
-    { $rfn:ident() -> $rty:ty = fn $cfn:ident } => {
+    { $(#[$m:meta])* $rfn:ident() -> $rty:ty = fn $cfn:ident } => {
+        $(#[$m])*
         pub fn $rfn(&self) -> $rty {
             unsafe{::mbedtls_sys::$cfn(&self.inner).into()}
         }