Fix generic types for untagged enum codegen

rusterlium · Aug 2, 2021 · 28e0f90 · 28e0f90
1 parent c882c95
commit 28e0f90
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/rustler_codegen/src/untagged_enum.rs b/rustler_codegen/src/untagged_enum.rs
@@ -57,7 +57,7 @@ fn gen_decoder(ctx: &Context, variants: &[&Variant]) -> TokenStream {
             let field_type = &variant.fields.iter().next().unwrap().ty;
 
             quote! {
-                if let Ok(inner) = #field_type::decode(term) {
+                if let Ok(inner) = <#field_type>::decode(term) {
                     return Ok( #enum_name :: #variant_name ( inner ) )
                 }
             }

diff --git a/rustler_tests/lib/rustler_test.ex b/rustler_tests/lib/rustler_test.ex
@@ -63,6 +63,7 @@ defmodule RustlerTest do
   def unit_enum_echo(_), do: err()
   def untagged_enum_echo(_), do: err()
   def untagged_enum_with_truthy(_), do: err()
+  def untagged_enum_for_issue_370(_), do: err()
   def newtype_echo(_), do: err()
   def tuplestruct_echo(_), do: err()
   def newtype_record_echo(_), do: err()

diff --git a/rustler_tests/native/rustler_test/src/lib.rs b/rustler_tests/native/rustler_test/src/lib.rs
@@ -59,6 +59,7 @@ rustler::init!(
         test_codegen::unit_enum_echo,
         test_codegen::untagged_enum_echo,
         test_codegen::untagged_enum_with_truthy,
+        test_codegen::untagged_enum_for_issue_370,
         test_codegen::newtype_echo,
         test_codegen::tuplestruct_echo,
         test_codegen::newtype_record_echo,

diff --git a/rustler_tests/native/rustler_test/src/test_codegen.rs b/rustler_tests/native/rustler_test/src/test_codegen.rs
@@ -85,6 +85,18 @@ pub fn untagged_enum_with_truthy(untagged_enum: UntaggedEnumWithTruthy) -> Untag
     untagged_enum
 }
 
+#[derive(NifUntaggedEnum)]
+pub enum UntaggedEnumForIssue370 {
+    Vec(Vec<i64>),
+}
+
+#[rustler::nif]
+pub fn untagged_enum_for_issue_370(
+    untagged_enum: UntaggedEnumForIssue370,
+) -> UntaggedEnumForIssue370 {
+    untagged_enum
+}
+
 #[derive(NifTuple)]
 pub struct Newtype(i64);
 

diff --git a/rustler_tests/test/codegen_test.exs b/rustler_tests/test/codegen_test.exs
@@ -119,6 +119,10 @@ defmodule RustlerTest.CodegenTest do
     assert false == RustlerTest.untagged_enum_with_truthy(nil)
   end
 
+  test "untagged enum for issue 370" do
+    assert [1, 2, 3] == RustlerTest.untagged_enum_for_issue_370([1, 2, 3])
+  end
+
   test "newtype tuple" do
     assert {1} == RustlerTest.newtype_echo({1})