Merge branch 'master' into maybe-uninit

rusterlium · Oct 13, 2019 · 23ef1ed · evnu · Oct 13, 2019 · filmor
2 parents 8906fb4 + afda9b8
commit 23ef1ed
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/rustler/src/resource.rs b/rustler/src/resource.rs
@@ -86,7 +86,14 @@ pub fn open_struct_resource_type<'a, T: ResourceTypeProvider>(
         )
     };
 
-    res.map(|r| ResourceType { res: r, struct_type: PhantomData})
+    if let Some(res) = res {
+        Some(ResourceType {
+            res,
+            struct_type: PhantomData,
+        })
+    } else {
+        None
+    }
 }
 
 fn get_alloc_size_struct<T>() -> usize {

diff --git a/rustler_codegen/src/ex_struct.rs b/rustler_codegen/src/ex_struct.rs
@@ -100,8 +100,6 @@ pub fn gen_decoder(
     let gen = quote! {
         impl<'a> ::rustler::Decoder<'a> for #struct_type {
             fn decode(term: ::rustler::Term<'a>) -> Result<Self, ::rustler::Error> {
-                use ::rustler::Encoder;
-
                 #atom_defs
 
                 let env = term.get_env();

diff --git a/rustler_codegen/src/record.rs b/rustler_codegen/src/record.rs
@@ -157,7 +157,6 @@ pub fn gen_encoder(
             fn encode<'a>(&self, env: ::rustler::Env<'a>) -> ::rustler::Term<'a> {
                 #atom_defs
 
-                use ::rustler::Encoder;
                 let arr = #field_list_ast;
                 ::rustler::types::tuple::make_tuple(env, &arr)
             }

diff --git a/rustler_codegen/src/tuple.rs b/rustler_codegen/src/tuple.rs
@@ -133,7 +133,6 @@ pub fn gen_encoder(
     let gen = quote! {
         impl<'b> ::rustler::Encoder for #struct_typ {
             fn encode<'a>(&self, env: ::rustler::Env<'a>) -> ::rustler::Term<'a> {
-                use ::rustler::Encoder;
                 let arr = #field_list_ast;
                 ::rustler::types::tuple::make_tuple(env, &arr)
             }

diff --git a/rustler_sys/Cargo.toml b/rustler_sys/Cargo.toml
@@ -35,4 +35,4 @@ build = "build.rs"
 categories = ["external-ffi-bindings"]
 
 [dependencies]
-unreachable = "0.1"
+unreachable = "1.0"