Skip to content

Commit

Permalink
chore: loosen version requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
encody committed Oct 25, 2023
1 parent 48bad2c commit 23a1ad1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 14 deletions.
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@ version = "1.1.0"
# normal dependencies
near-sdk = { version = "4.1.1", default-features = false }
near-sdk-contract-tools-macros = { version = "=1.1.0", path = "./macros" }
thiserror = "1.0.35"
thiserror = "1.0"

base64 = "0.13.0"
darling = "0.14.1"
heck = "0.4.0"
once_cell = "1.16.0"
proc-macro2 = "1.0.43"
quote = "1.0.21"
regex = "1.6.0"
darling = "0.20"
heck = "0.4"
once_cell = "1.16"
proc-macro2 = "1.0"
quote = "1.0"
regex = "1.6"
strum = "0.25"
strum_macros = "0.25"
syn = "1.0.99"
syn = "2.0"

# dev-dependencies
near-crypto = "0.15.0"
near-crypto = "0.15"
near-workspaces = "0.8"
pretty_assertions = "1.4.0"
tokio = "1.21.1"
pretty_assertions = "1.4"
tokio = "1.21"

[dependencies]
near-sdk.workspace = true
Expand Down
11 changes: 8 additions & 3 deletions macros/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! Macros for near-sdk-contract-tools.

use darling::{FromDeriveInput, FromMeta};
use darling::{ast::NestedMeta, FromDeriveInput, FromMeta};
use proc_macro::TokenStream;
use syn::{parse_macro_input, AttributeArgs, DeriveInput, Item};
use syn::{parse_macro_input, DeriveInput, Item};

mod approval;
mod escrow;
Expand Down Expand Up @@ -248,7 +248,12 @@ pub fn derive_simple_multisig(input: TokenStream) -> TokenStream {
/// See documentation on the [`derive@Nep297`] derive macro for more details.
#[proc_macro_attribute]
pub fn event(attr: TokenStream, item: TokenStream) -> TokenStream {
let attr = parse_macro_input!(attr as AttributeArgs);
let attr = match NestedMeta::parse_meta_list(attr.into()) {
Ok(v) => v,
Err(e) => {
return TokenStream::from(darling::Error::from(e).write_errors());
}
};
let item = parse_macro_input!(item as Item);

standard::event::EventAttributeMeta::from_list(&attr)
Expand Down

0 comments on commit 23a1ad1

Please sign in to comment.