Skip to content

Commit 78bf091

Browse files
committed
rustfmt and updated changelog
1 parent 0ce8926 commit 78bf091

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ Released YYYY/MM/DD
121121
## Added
122122

123123
* Objective-c bindings generate `From<ChildClass> for ParentClass` as well as `TryFrom<ParentClass> for ChildClass` ([#1883][]).
124+
* Objective-c bindings generate impl blocks for categories inherited through parent classes ([#1784][]).
124125

125126
## Changed
126127

@@ -144,6 +145,7 @@ Released YYYY/MM/DD
144145

145146

146147
[#1883]: https://github.com/rust-lang/rust-bindgen/issues/1883
148+
[#1784]: https://github.com/rust-lang/rust-bindgen/issues/1784
147149

148150
--------------------------------------------------------------------------------
149151

src/codegen/mod.rs

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3982,26 +3982,25 @@ impl CodeGenerator for ObjCInterface {
39823982
}
39833983
for (category_name, category_template_names) in
39843984
&parent.categories
3985-
{
3986-
let category_name = ctx.rust_ident(category_name);
3987-
let impl_trait = if !category_template_names.is_empty()
3988-
{
3989-
let template_names: Vec<Ident> =
3990-
category_template_names
3985+
{
3986+
let category_name = ctx.rust_ident(category_name);
3987+
let impl_trait = if !category_template_names.is_empty() {
3988+
let template_names: Vec<Ident> =
3989+
category_template_names
39913990
.iter()
39923991
.map(|g| ctx.rust_ident(g))
39933992
.collect();
3994-
quote! {
3995-
impl <#(#template_names :'static),*> #category_name <#(#template_names),*> for #class_name {
3996-
}
3997-
}
3998-
} else {
3999-
quote! {
4000-
impl #category_name for #class_name { }
3993+
quote! {
3994+
impl <#(#template_names :'static),*> #category_name <#(#template_names),*> for #class_name {
40013995
}
4002-
};
4003-
result.push(impl_trait);
4004-
}
3996+
}
3997+
} else {
3998+
quote! {
3999+
impl #category_name for #class_name { }
4000+
}
4001+
};
4002+
result.push(impl_trait);
4003+
}
40054004
if !parent.is_template() {
40064005
let parent_struct_name = parent.name();
40074006
let child_struct_name = self.name();

0 commit comments

Comments
 (0)