Fixes from merging master into feature branch

Author: simlay

src/codegen/mod.rs

@@ -3980,6 +3980,28 @@ impl CodeGenerator for ObjCInterface {
                         result.push(impl_trait);
                     }
                 }
+                for (category_name, category_template_names) in
+                    &parent.categories
+                    {
+                        let category_name = ctx.rust_ident(category_name);
+                        let impl_trait = if !category_template_names.is_empty()
+                        {
+                            let template_names: Vec<Ident> =
+                                category_template_names
+                                .iter()
+                                .map(|g| ctx.rust_ident(g))
+                                .collect();
+                            quote! {
+                                impl <#(#template_names :'static),*> #category_name <#(#template_names),*> for #class_name {
+                                }
+                            }
+                        } else {
+                            quote! {
+                                impl #category_name for #class_name { }
+                            }
+                        };
+                        result.push(impl_trait);
+                    }
                 if !parent.is_template() {
                     let parent_struct_name = parent.name();
                     let child_struct_name = self.name();
@@ -4011,28 +4033,6 @@ impl CodeGenerator for ObjCInterface {
                         }
                     };
                     result.push(try_into_block);
-                    for (category_name, category_template_names) in
-                        &parent.categories
-                    {
-                        let category_name = ctx.rust_ident(category_name);
-                        let impl_trait = if !category_template_names.is_empty()
-                        {
-                            let template_names: Vec<Ident> =
-                                category_template_names
-                                    .iter()
-                                    .map(|g| ctx.rust_ident(g))
-                                    .collect();
-                            quote! {
-                                impl <#(#template_names :'static),*> #category_name <#(#template_names),*> for #class_name {
-                                }
-                            }
-                        } else {
-                            quote! {
-                                impl #category_name for #class_name { }
-                            }
-                        };
-                        result.push(impl_trait);
-                    }
                     parent.parent_class
                 } else {
                     None

tests/expectations/tests/objc_category_inheritance.rs

@@ -11,7 +11,7 @@ extern crate objc;
 #[allow(non_camel_case_types)]
 pub type id = *mut objc::runtime::Object;
 #[repr(transparent)]
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct Foo(pub id);
 impl std::ops::Deref for Foo {
     type Target = objc::runtime::Object;
@@ -30,7 +30,7 @@ pub trait IFoo: Sized + std::ops::Deref {}
 impl Foo_BarCategory for Foo {}
 pub trait Foo_BarCategory: Sized + std::ops::Deref {}
 #[repr(transparent)]
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct Bar(pub id);
 impl std::ops::Deref for Bar {
     type Target = objc::runtime::Object;
@@ -46,5 +46,22 @@ impl Bar {
 }
 impl IFoo for Bar {}
 impl Foo_BarCategory for Bar {}
+impl From<Bar> for Foo {
+    fn from(child: Bar) -> Foo {
+        Foo(child.0)
+    }
+}
+impl std::convert::TryFrom<Foo> for Bar {
+    type Error = &'static str;
+    fn try_from(parent: Foo) -> Result<Bar, Self::Error> {
+        let is_kind_of: bool =
+            unsafe { msg_send!(parent, isKindOfClass: class!(Bar)) };
+        if is_kind_of {
+            Ok(Bar(parent.0))
+        } else {
+            Err("This Foo cannot be downcasted to Bar")
+        }
+    }
+}
 impl IBar for Bar {}
 pub trait IBar: Sized + std::ops::Deref {}

tests/expectations/tests/objc_category_template_inheritance.rs

@@ -11,7 +11,7 @@ extern crate objc;
 #[allow(non_camel_case_types)]
 pub type id = *mut objc::runtime::Object;
 #[repr(transparent)]
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct Foo(pub id);
 impl std::ops::Deref for Foo {
     type Target = objc::runtime::Object;
@@ -30,7 +30,7 @@ pub trait IFoo<ObjectType>: Sized + std::ops::Deref {}
 impl<ObjectType: 'static> Foo_Baz<ObjectType> for Foo {}
 pub trait Foo_Baz<ObjectType>: Sized + std::ops::Deref {}
 #[repr(transparent)]
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct Bar(pub id);
 impl std::ops::Deref for Bar {
     type Target = objc::runtime::Object;

tests/expectations/tests/objc_template_inheritance.rs

@@ -11,7 +11,7 @@ extern crate objc;
 #[allow(non_camel_case_types)]
 pub type id = *mut objc::runtime::Object;
 #[repr(transparent)]
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct Foo(pub id);
 impl std::ops::Deref for Foo {
     type Target = objc::runtime::Object;
@@ -28,7 +28,7 @@ impl Foo {
 impl<ObjectType: 'static> IFoo<ObjectType> for Foo {}
 pub trait IFoo<ObjectType>: Sized + std::ops::Deref {}
 #[repr(transparent)]
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct Bar(pub id);
 impl std::ops::Deref for Bar {
     type Target = objc::runtime::Object;