fix: Handle newtypes with a public field

Fixes gluon-lang#713
Marwes · Apr 16, 2019 · d1fef96 · d1fef96
1 parent 81ebabe
commit d1fef96
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/base/src/types/mod.rs b/base/src/types/mod.rs
@@ -6,7 +6,7 @@ use std::{
     iter,
     marker::PhantomData,
     mem,
-    ops::{self, Deref, DerefMut},
+    ops::{Deref, DerefMut},
     rc::Rc,
     sync::Arc,
 };

diff --git a/codegen/src/getable.rs b/codegen/src/getable.rs
@@ -85,12 +85,13 @@ where
     // Treat newtype structs as just their inner type
     let (first, second) = (fields.next(), fields.next());
     match (&first, &second) {
-        (Some(field_ty), None) => {
+        (Some(field), None) => {
+            let field_ty = &field.ty;
             return quote! {
                 #ident (
                 <#field_ty as _gluon_api::Getable<'__vm, '__value>>::from_value(vm, variants)
                 )
-            }
+            };
         }
         _ => (),
     }

diff --git a/codegen/tests/full.rs b/codegen/tests/full.rs
@@ -60,7 +60,7 @@ fn normal_struct() {
 }
 
 #[derive(Debug, PartialEq, VmType, Pushable, Getable)]
-struct Newtype(Struct);
+struct Newtype(pub Struct);
 
 fn load_newtype_mod(vm: &Thread) -> vm::Result<ExternModule> {
     let module = record! {