From 7792d633c78d4ad39979e09a6215b656f7ec31f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 25 Nov 2020 14:38:00 +0100
Subject: [PATCH] codegen: Minor nits for dynamic function generation.

---
 src/codegen/dyngen.rs | 15 ++-------------
 src/codegen/mod.rs    | 17 +++++------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/codegen/dyngen.rs b/src/codegen/dyngen.rs
index aab6cac9ea..4cd01c0173 100644
--- a/src/codegen/dyngen.rs
+++ b/src/codegen/dyngen.rs
@@ -2,6 +2,7 @@ use crate::ir::function::Abi;
 use proc_macro2::Ident;
 
 /// Used to build the output tokens for dynamic bindings.
+#[derive(Default)]
 pub struct DynamicItems {
     /// Tracks the tokens that will appears inside the library struct -- e.g.:
     /// ```ignore
@@ -74,18 +75,6 @@ pub struct DynamicItems {
     init_fields: Vec<proc_macro2::TokenStream>,
 }
 
-impl Default for DynamicItems {
-    fn default() -> Self {
-        DynamicItems {
-            struct_members: vec![],
-            struct_implementation: vec![],
-            runtime_checks: vec![],
-            constructor_inits: vec![],
-            init_fields: vec![],
-        }
-    }
-}
-
 impl DynamicItems {
     pub fn new() -> Self {
         Self::default()
@@ -141,7 +130,7 @@ impl DynamicItems {
         }
     }
 
-    pub fn add_function(
+    pub fn push(
         &mut self,
         ident: Ident,
         abi: Abi,
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index a62979b0bf..64f95f4ca8 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -3805,7 +3805,7 @@ impl CodeGenerator for Function {
                 TypeKind::Void => quote! {()},
                 _ => return_item.to_rust_ty_or_opaque(ctx, &()),
             };
-            result.dynamic_items().add_function(
+            result.dynamic_items().push(
                 ident,
                 abi,
                 args,
@@ -4105,17 +4105,10 @@ pub(crate) fn codegen(
             &(),
         );
 
-        if context.options().dynamic_library_name.is_some() {
-            let lib_ident = context.rust_ident(
-                context.options().dynamic_library_name.as_ref().unwrap(),
-            );
-            let check_struct_ident = context.rust_ident(
-                [
-                    "Check",
-                    context.options().dynamic_library_name.as_ref().unwrap(),
-                ]
-                .join(""),
-            );
+        if let Some(ref lib_name) = context.options().dynamic_library_name {
+            let lib_ident = context.rust_ident(lib_name);
+            let check_struct_ident =
+                context.rust_ident(format!("Check{}", lib_name));
             let dynamic_items_tokens = result
                 .dynamic_items()
                 .get_tokens(lib_ident, check_struct_ident);