Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 4 deletions

diff --git a/third_party/rust/uniffi_macros/src/export/utrait.rs b/third_party/rust/uniffi_macros/src/export/utrait.rs
index 3db09ea2b7..9007ae2c56 100644
--- a/third_party/rust/uniffi_macros/src/export/utrait.rs
+++ b/third_party/rust/uniffi_macros/src/export/utrait.rs
@@ -6,8 +6,10 @@ use proc_macro2::{Ident, TokenStream};
 use quote::quote;
 use syn::ext::IdentExt;
 
-use super::{attributes::ExportAttributeArguments, gen_ffi_function};
+use super::gen_ffi_function;
+use crate::export::ExportedImplFnArgs;
 use crate::fnsig::FnSignature;
+use crate::util::extract_docstring;
 use uniffi_meta::UniffiTraitDiscriminants;
 
 pub(crate) fn expand_uniffi_trait_export(
@@ -157,12 +159,25 @@ fn process_uniffi_trait_method(
         unreachable!()
     };
 
+    let docstring = extract_docstring(&item.attrs)?;
+
     let ffi_func = gen_ffi_function(
-        &FnSignature::new_method(self_ident.clone(), item.sig.clone())?,
-        &ExportAttributeArguments::default(),
+        &FnSignature::new_method(
+            self_ident.clone(),
+            item.sig.clone(),
+            ExportedImplFnArgs::default(),
+            docstring.clone(),
+        )?,
+        &None,
         udl_mode,
     )?;
     // metadata for the method, which will be packed inside metadata for the trait.
-    let method_meta = FnSignature::new_method(self_ident.clone(), item.sig)?.metadata_expr()?;
+    let method_meta = FnSignature::new_method(
+        self_ident.clone(),
+        item.sig,
+        ExportedImplFnArgs::default(),
+        docstring,
+    )?
+    .metadata_expr()?;
     Ok((ffi_func, method_meta))
 }