Merge branch 'master' into fix_docrs

macros/support/src/aggr_co_class/class_factory.rs

@@ -5,7 +5,8 @@ use syn::ItemStruct;
 // We manually generate a ClassFactory without macros, otherwise
 // it leads to an infinite loop.
 pub fn generate(struct_item: &ItemStruct) -> HelperTokenStream {
-    let base_interface_idents = crate::co_class::class_factory::get_class_factory_base_interface_idents();
+    let base_interface_idents =
+        crate::co_class::class_factory::get_class_factory_base_interface_idents();
     let aggr_map = crate::co_class::class_factory::get_class_factory_aggr_map();
 
     let struct_ident = &struct_item.ident;

macros/support/src/aggr_co_class/com_struct.rs

@@ -21,8 +21,7 @@ pub fn generate(
     let aggregate_fields = co_class::com_struct::gen_aggregate_fields(aggr_map);
 
     // COM Fields for an aggregable coclass.
-    let non_delegating_iunknown_field_ident =
-        crate::utils::non_delegating_iunknown_field_ident();
+    let non_delegating_iunknown_field_ident = crate::utils::non_delegating_iunknown_field_ident();
     let iunknown_to_use_field_ident = crate::utils::iunknown_to_use_field_ident();
 
     quote!(

macros/support/src/utils/idents.rs

@@ -88,4 +88,4 @@ pub fn get_aggr_map(attr_args: &AttributeArgs) -> HashMap<Ident, Vec<Ident>> {
     }
 
     aggr_map
-}
+}

macros/support/src/utils/mod.rs

@@ -46,4 +46,4 @@ mod tests {
         assert_eq!(result, "ianimal_vtable".to_owned());
     }
     use super::*;
-}
+}