Merge pull request #43 from jerel/bugfix

Release 0.9.6
jerel · Jul 21, 2023 · 0b8b35c · 0b8b35c
2 parents 15d5cb1 + f755eb9
commit 0b8b35c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/example/Cargo.lock b/example/Cargo.lock
diff --git a/membrane/Cargo.toml b/membrane/Cargo.toml
@@ -8,7 +8,7 @@ name = "membrane"
 readme = "../README.md"
 repository = "https://github.com/jerel/membrane"
 rust-version = "1.61"
-version = "0.9.5"
+version = "0.9.6"
 
 [lib]
 crate-type = ["lib"]

diff --git a/membrane_macro/Cargo.toml b/membrane_macro/Cargo.toml
@@ -4,7 +4,7 @@ description = "A companion crate for `membrane`"
 edition = "2018"
 license = "Apache-2.0"
 name = "membrane_macro"
-version = "0.7.0"
+version = "0.7.1"
 
 [lib]
 proc-macro = true

diff --git a/membrane_macro/src/parsers.rs b/membrane_macro/src/parsers.rs
@@ -61,6 +61,8 @@ pub fn parse_return_type(input: ParseStream) -> Result<(OutputStyle, syn::Type,
 fn parse_type(input: ParseStream) -> Result<(syn::Type, syn::Type)> {
   let outer_span = input.span();
   let type_path = input.parse::<syn::TypePath>()?;
+  // if the formatter inserts a trailing comma on multi-line types then discard it
+  let _ = input.parse::<Token![,]>();
   let return_type = &type_path.path.segments.last().unwrap();
   if return_type.ident != "Result" {
     return Err(Error::new(outer_span, "expected enum `Result`"));

diff --git a/membrane_types/src/rust.rs b/membrane_types/src/rust.rs
@@ -113,13 +113,13 @@ pub fn flatten_types(ty: &syn::Type, mut types: Vec<String>) -> syn::Result<Vec<
 fn rust_c_type(ty: &[&str], type_: &syn::Type) -> syn::Result<TokenStream2> {
   let result = match ty[..] {
     ["String"] => q!(*const ::std::os::raw::c_char),
-    ["i64"] => q!(::std::os::raw::c_long),
+    ["i64"] => q!(::std::os::raw::c_longlong),
     ["f64"] => q!(::std::os::raw::c_double),
     ["bool"] => q!(::std::os::raw::c_char), // i8
     ["Vec", ..] => q!(*const u8),
     [serialized] if serialized != "Option" => q!(*const u8),
     ["Option", "String"] => q!(*const ::std::os::raw::c_char),
-    ["Option", "i64"] => q!(*const ::std::os::raw::c_long),
+    ["Option", "i64"] => q!(*const ::std::os::raw::c_longlong),
     ["Option", "f64"] => q!(*const ::std::os::raw::c_double),
     ["Option", "bool"] => q!(*const ::std::os::raw::c_char), // i8
     ["Option", ..] => q!(*const u8),