From 35b2eff29ca1a55fb13a34f513c1cb785a88916e Mon Sep 17 00:00:00 2001
From: Isaac Clayton <slightknack@gmail.com>
Date: Fri, 3 Jun 2022 11:18:54 +0200
Subject: [PATCH] Update plugin dependencies

---
 Cargo.lock                      | 24 ++++++++++++------------
 crates/plugin/Cargo.toml        |  2 +-
 crates/plugin/src/lib.rs        | 23 +++++++++++------------
 crates/plugin_macros/src/lib.rs | 14 ++++++--------
 4 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa9eb96708..b9dd80470a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3614,10 +3614,21 @@ name = "plugin"
 version = "0.1.0"
 dependencies = [
  "bincode",
- "rust_plugin_macros",
+ "plugin_macros",
  "serde",
 ]
 
+[[package]]
+name = "plugin_macros"
+version = "0.1.0"
+dependencies = [
+ "bincode",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn",
+]
+
 [[package]]
 name = "png"
 version = "0.16.8"
@@ -4320,17 +4331,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "rust_plugin_macros"
-version = "0.1.0"
-dependencies = [
- "bincode",
- "proc-macro2",
- "quote",
- "serde",
- "syn",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.21"
diff --git a/crates/plugin/Cargo.toml b/crates/plugin/Cargo.toml
index 28b5be9984..c4f22c94d3 100644
--- a/crates/plugin/Cargo.toml
+++ b/crates/plugin/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 [dependencies]
 serde = "1.0"
 bincode = "1.3"
-rust_plugin_macros = { path = "../plugin_macros" }
\ No newline at end of file
+plugin_macros = { path = "../plugin_macros" }
\ No newline at end of file
diff --git a/crates/plugin/src/lib.rs b/crates/plugin/src/lib.rs
index 40d5e17012..42ed97c0d4 100644
--- a/crates/plugin/src/lib.rs
+++ b/crates/plugin/src/lib.rs
@@ -1,7 +1,7 @@
 #[repr(C)]
-pub struct Buffer {
-    ptr: *const u8,
-    len: usize,
+pub struct __Buffer {
+    pub ptr: *const u8,
+    pub len: usize,
 }
 
 /// Allocates a buffer with an exact size.
@@ -9,7 +9,7 @@ pub struct Buffer {
 #[no_mangle]
 pub extern "C" fn __alloc_buffer(len: usize) -> *const u8 {
     let vec = vec![0; len];
-    let buffer = unsafe { Buffer::from_vec(vec) };
+    let buffer = unsafe { __Buffer::from_vec(vec) };
     return buffer.ptr;
 }
 
@@ -21,31 +21,30 @@ pub extern "C" fn __alloc_buffer(len: usize) -> *const u8 {
 //     std::mem::drop(vec);
 // }
 
-impl Buffer {
+impl __Buffer {
     #[inline(always)]
     pub unsafe fn to_vec(&self) -> Vec<u8> {
-        slice::from_raw_parts(self.ptr, self.len).to_vec()
+        core::slice::from_raw_parts(self.ptr, self.len).to_vec()
     }
 
     #[inline(always)]
-    pub unsafe fn from_vec(mut vec: Vec<u8>) -> Buffer {
+    pub unsafe fn from_vec(mut vec: Vec<u8>) -> __Buffer {
         vec.shrink_to(0);
         let ptr = vec.as_ptr();
         let len = vec.len();
         std::mem::forget(vec);
-        Buffer { ptr, len }
+        __Buffer { ptr, len }
     }
 
     #[inline(always)]
-    pub fn leak_to_heap(self) -> *const Buffer {
+    pub fn leak_to_heap(self) -> *const __Buffer {
         let boxed = Box::new(self);
-        let ptr = Box::<Buffer>::into_raw(boxed) as *const Buffer;
+        let ptr = Box::<__Buffer>::into_raw(boxed) as *const __Buffer;
         return ptr;
     }
 }
 
 pub mod prelude {
-    pub use super::{Buffer, __alloc_buffer};
-    #[macro_use]
+    pub use super::{__Buffer, __alloc_buffer};
     pub use plugin_macros::bind;
 }
diff --git a/crates/plugin_macros/src/lib.rs b/crates/plugin_macros/src/lib.rs
index c8d0f1f93f..3d762c6a98 100644
--- a/crates/plugin_macros/src/lib.rs
+++ b/crates/plugin_macros/src/lib.rs
@@ -2,7 +2,7 @@ use core::panic;
 
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
-use syn::{parse_macro_input, ItemFn, VisPublic, Visibility};
+use syn::{parse_macro_input, ItemFn, Visibility};
 
 #[proc_macro_attribute]
 pub fn bind(args: TokenStream, function: TokenStream) -> TokenStream {
@@ -20,25 +20,23 @@ pub fn bind(args: TokenStream, function: TokenStream) -> TokenStream {
     let outer_fn_name = format_ident!("__{}", inner_fn_name);
 
     TokenStream::from(quote! {
-        use serde;
-
         #[no_mangle]
         #inner_fn
 
         #[no_mangle]
-        pub extern "C" fn #outer_fn_name(ptr: *const u8, len: usize) -> *const Buffer {
+        pub extern "C" fn #outer_fn_name(ptr: *const u8, len: usize) -> *const ::plugin::__Buffer {
             // setup
-            let buffer = Buffer { ptr, len };
+            let buffer = ::plugin::__Buffer { ptr, len };
             let data = unsafe { buffer.to_vec() };
 
             // operation
-            let argument = bincode::deserialize(&data).unwrap();
+            let argument = ::bincode::deserialize(&data).unwrap();
             let result = #inner_fn_name(argument);
-            let new_data: Result<Vec<u8>, _> = bincode::serialize(&result);
+            let new_data: Result<Vec<u8>, _> = ::bincode::serialize(&result);
             let new_data = new_data.unwrap();
 
             // teardown
-            let new_buffer = unsafe { Buffer::from_vec(new_data) };
+            let new_buffer = unsafe { ::plugin::__Buffer::from_vec(new_data) };
             return new_buffer.leak_to_heap();
         }
     })