Merge #668 #680

668: Fix minor mistakes in the Variant macros r=toasteater a=toasteater

- Add missing import to `derive(ToVariant)` output
- Use the correct variant name instead of `Ok` (leftover from `Result` impl) for `FromVariant` errors

Close #665

680: Take self by value when deriving OwnedToVariant r=toasteater a=toasteater

This was preventing the macro from working on types whose fields actually require OwnedToVariant.

Co-authored-by: toasteater <48371905+toasteater@users.noreply.github.com>

Author: bors[bot]

gdnative-derive/src/variant/from.rs

@@ -87,7 +87,7 @@ pub(crate) fn expand_from_variant(derive_data: DeriveData) -> Result<TokenStream
                                 #ref_var_ident_string_literals => {
                                     let #var_input_ident_iter = &__dict.get(&__keys.get(0));
                                     (#var_from_variants).map_err(|err| FVE::InvalidEnumVariant {
-                                        variant: "Ok",
+                                        variant: #ref_var_ident_string_literals,
                                         error: Box::new(err),
                                     })
                                 },

gdnative-derive/src/variant/to.rs

@@ -48,17 +48,19 @@ pub(crate) fn expand_to_variant(
                         let tokens = quote! {
                             #ident::#var_ident #destructure_pattern => {
                                 let __dict = ::gdnative::core_types::Dictionary::new();
-                                let __key = ::gdnative::core_types::GodotString::from(#var_ident_string_literal).to_variant();
+                                let __key = ::gdnative::core_types::ToVariant::to_variant(
+                                    &::gdnative::core_types::GodotString::from(#var_ident_string_literal)
+                                );
                                 let __value = #to_variant;
                                 __dict.insert(&__key, &__value);
-                                __dict.into_shared().to_variant()
+                                ::gdnative::core_types::ToVariant::to_variant(&__dict.into_shared())
                             }
                         };
                         Ok(tokens)
                     }).collect::<Result<Vec<_>,syn::Error>>()?;
 
                 quote! {
-                    match &self {
+                    match #to_variant_receiver {
                         #( #match_arms ),*
                     }
                 }

gdnative/tests/ui/variant_pass.rs

@@ -36,4 +36,12 @@ pub struct Foo {
     skip_from: String,
 }
 
+#[derive(OwnedToVariant)]
+pub struct Owned;
+
+#[derive(OwnedToVariant)]
+pub struct Bar {
+    owned: Owned,
+}
+
 fn main() {}