status-im/evmc
2
0
Fork 0
mirror of https://github.com/status-im/evmc.git synced 2025-02-24 00:48:09 +00:00
Code Issues Projects Releases Wiki Activity

rust: update evmc-declare's proc-macro/syn/quote dependencies to 1.0

Browse Source
This commit is contained in:
Alex Beregszaszi 2019-11-26 23:34:39 +01:00
parent bb18fca1ca
commit 3133719a47
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/rust/evmc-declare/Cargo.toml
View File

@ -12,10 +12,10 @@ description = "Bindings to EVMC (VM declare macro)"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
quote = "0.6.12" quote = "1.0"
heck = "0.3.1" heck = "0.3.1"
proc-macro2 = "0.4.29" proc-macro2 = "1.0"
syn = { version = "0.15.33", features = ["full"] } syn = { version = "1.0", features = ["full"] }
# For documentation examples # For documentation examples
evmc-vm = { path = "../evmc-vm" } evmc-vm = { path = "../evmc-vm" }

11
bindings/rust/evmc-declare/src/lib.rs
View File

@ -41,7 +41,6 @@ use syn::parse_macro_input;
use syn::spanned::Spanned; use syn::spanned::Spanned;
use syn::AttributeArgs; use syn::AttributeArgs;
use syn::Ident; use syn::Ident;
use syn::IntSuffix;
use syn::ItemStruct; use syn::ItemStruct;
use syn::Lit; use syn::Lit;
use syn::LitInt; use syn::LitInt;
@ -126,7 +125,7 @@ impl VMMetaData {
let vm_version_meta = &args[2]; let vm_version_meta = &args[2];
let vm_name_string = match vm_name_meta { let vm_name_string = match vm_name_meta {
NestedMeta::Literal(lit) => { NestedMeta::Lit(lit) => {
if let Lit::Str(s) = lit { if let Lit::Str(s) = lit {
// Add a null terminator here to ensure that it is handled correctly when // Add a null terminator here to ensure that it is handled correctly when
// converted to a C String. // converted to a C String.
@ -141,7 +140,7 @@ impl VMMetaData {
}; };
let vm_capabilities_string = match vm_capabilities_meta { let vm_capabilities_string = match vm_capabilities_meta {
NestedMeta::Literal(lit) => { NestedMeta::Lit(lit) => {
if let Lit::Str(s) = lit { if let Lit::Str(s) = lit {
s.value().to_string() s.value().to_string()
} else { } else {
@ -170,7 +169,7 @@ impl VMMetaData {
ret ret
}; };
let vm_version_string: String = if let NestedMeta::Literal(lit) = vm_version_meta { let vm_version_string: String = if let NestedMeta::Lit(lit) = vm_version_meta {
match lit { match lit {
// Add a null terminator here to ensure that it is handled correctly when // Add a null terminator here to ensure that it is handled correctly when
// converted to a C String. // converted to a C String.
@ -268,8 +267,8 @@ fn build_static_data(names: &VMNameSet, metadata: &VMMetaData) -> proc_macro2::T
/// Takes a capabilities flag and builds the evmc_get_capabilities callback. /// Takes a capabilities flag and builds the evmc_get_capabilities callback.
fn build_capabilities_fn(capabilities: u32) -> proc_macro2::TokenStream { fn build_capabilities_fn(capabilities: u32) -> proc_macro2::TokenStream {
let capabilities_literal = let capabilities_string = capabilities.to_string();
LitInt::new(capabilities as u64, IntSuffix::U32, capabilities.span()); let capabilities_literal = LitInt::new(&capabilities_string, capabilities.span());
quote! { quote! {
extern "C" fn __evmc_get_capabilities(instance: *mut ::evmc_vm::ffi::evmc_vm) -> ::evmc_vm::ffi::evmc_capabilities_flagset { extern "C" fn __evmc_get_capabilities(instance: *mut ::evmc_vm::ffi::evmc_vm) -> ::evmc_vm::ffi::evmc_capabilities_flagset {