From b89a9878d296b2b6c45cc8bd3fcd10337e474a7a Mon Sep 17 00:00:00 2001
From: vms <michail.vms@gmail.com>
Date: Wed, 29 Apr 2020 00:15:05 +0300
Subject: [PATCH] get rid of excess exports for module since
 https://github.com/rust-lang/rust/issues/63562 fixed

---
 crates/macro/src/macro_attr_parser.rs | 11 +----------
 crates/main/src/logger/mod.rs         |  6 +++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/crates/macro/src/macro_attr_parser.rs b/crates/macro/src/macro_attr_parser.rs
index 65377b6..ce12e9a 100644
--- a/crates/macro/src/macro_attr_parser.rs
+++ b/crates/macro/src/macro_attr_parser.rs
@@ -136,12 +136,8 @@ impl Parse for HandlerAttr {
 
 pub fn generate_side_modules_glue_code(side_modules_list: &[String]) -> syn::Result<TokenStream2> {
     let mut modules_glue_code = quote!();
+
     for module_name in side_modules_list {
-        let allocate_fn_name = format!("{}_allocate", module_name);
-        let deallocate_fn_name = format!("{}_deallocate", module_name);
-        let invoke_fn_name = format!("{}_invoke", module_name);
-        let load_fn_name = format!("{}_load", module_name);
-        let store_fn_name = format!("{}_store", module_name);
         let module_name_ident = syn::parse_str::<syn::Ident>(&module_name)?;
 
         modules_glue_code = quote! {
@@ -149,23 +145,18 @@ pub fn generate_side_modules_glue_code(side_modules_list: &[String]) -> syn::Res
                 #[link(wasm_import_module = #module_name)]
                 extern "C" {
                     // Allocate chunk of module memory, and return a pointer to that region
-                    #[link_name = #allocate_fn_name]
                     pub fn allocate(size: usize) -> i32;
 
                     // Deallocate chunk of module memory after it's not used anymore
-                    #[link_name = #deallocate_fn_name]
                     pub fn deallocate(ptr: i32, size: usize);
 
                     // Call module's invocation handler with data specified by pointer and size
-                    #[link_name = #invoke_fn_name]
                     pub fn invoke(ptr: i32, size: usize) -> i32;
 
                     // Read 1 byte from ptr location of module memory
-                    #[link_name = #load_fn_name]
                     pub fn load(ptr: i32) -> u8;
 
                     // Put 1 byte at ptr location in module memory
-                    #[link_name = #store_fn_name]
                     pub fn store(ptr: *mut i32, byte: u8);
                 }
 
diff --git a/crates/main/src/logger/mod.rs b/crates/main/src/logger/mod.rs
index 9653437..0ae56c4 100644
--- a/crates/main/src/logger/mod.rs
+++ b/crates/main/src/logger/mod.rs
@@ -73,7 +73,7 @@
 //! [`lazy_static::initialize()`]: https://docs.rs/lazy_static/1.3.0/lazy_static/fn.initialize.html
 //! [`backend app debugging`]: https://fluence.dev/docs/debugging
 
-extern crate log;
+use log;
 
 /// The Wasm Logger.
 ///
@@ -137,12 +137,12 @@ impl WasmLogger {
 
 impl log::Log for WasmLogger {
     #[inline]
-    fn enabled(&self, metadata: &log::Metadata) -> bool {
+    fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
         metadata.level() <= self.level
     }
 
     #[inline]
-    fn log(&self, record: &log::Record) {
+    fn log(&self, record: &log::Record<'_>) {
         if !self.enabled(record.metadata()) {
             return;
         }