From b78145bfb6a6f81425dfd6fbacb9c03624e79b2c Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 16 Oct 2020 18:03:24 +0200 Subject: [PATCH] Port to recent versions of the quote, syn and proc_macro2 crates --- test-generator/Cargo.toml | 6 +++--- test-generator/src/lib.rs | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test-generator/Cargo.toml b/test-generator/Cargo.toml index ac14d48..e7b45b0 100644 --- a/test-generator/Cargo.toml +++ b/test-generator/Cargo.toml @@ -16,6 +16,6 @@ proc-macro = true [dependencies] glob = "^0.3" -quote = "0.6" -syn = { version="^0.15", features=["full"] } -proc-macro2 = "^0.4" +quote = "1.0" +syn = { version="1.0", features=["full"] } +proc-macro2 = "1.0" diff --git a/test-generator/src/lib.rs b/test-generator/src/lib.rs index 7428d02..176592c 100644 --- a/test-generator/src/lib.rs +++ b/test-generator/src/lib.rs @@ -231,8 +231,8 @@ pub fn test_resources(attrs: TokenStream, func: TokenStream) -> TokenStream { Lit::Byte(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), Lit::ByteStr(_) => panic!("expected string parameter, got byte-string"), Lit::Char(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), - Lit::Int(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), - Lit::Float(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), + Lit::Int(l) => panic!(format!("expected string parameter, got '{}'", l)), + Lit::Float(l) => panic!(format!("expected string parameter, got '{}'", l)), _ => panic!("expected string parameter"), }; @@ -241,7 +241,7 @@ pub fn test_resources(attrs: TokenStream, func: TokenStream) -> TokenStream { let func_ast: ItemFn = syn::parse(func) .expect("failed to parse tokens as a function"); - let func_ident = func_ast.ident; + let func_ident = func_ast.sig.ident; let paths: Paths = glob(&pattern).expect(&format!("No such file or directory {}", &pattern)); @@ -351,8 +351,8 @@ pub fn bench_resources(attrs: TokenStream, func: TokenStream) -> TokenStream { Lit::Byte(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), Lit::ByteStr(_) => panic!("expected string parameter, got byte-string"), Lit::Char(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), - Lit::Int(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), - Lit::Float(l) => panic!(format!("expected string parameter, got '{}'", &l.value())), + Lit::Int(l) => panic!(format!("expected string parameter, got '{}'", l)), + Lit::Float(l) => panic!(format!("expected string parameter, got '{}'", l)), _ => panic!("expected string parameter"), }; @@ -361,7 +361,7 @@ pub fn bench_resources(attrs: TokenStream, func: TokenStream) -> TokenStream { let func_ast: ItemFn = syn::parse(func) .expect("failed to parse tokens as a function"); - let func_ident = func_ast.ident; + let func_ident = func_ast.sig.ident; let paths: Paths = glob(&pattern).expect(&format!("No such file or directory {}", &pattern)); @@ -572,7 +572,7 @@ fn expr_stringified(expr: &Expr, int_as_hex: bool) -> String { attrs: _, } => match litval { Lit::Int(lit) => { - let val = lit.value(); + let val: u64 = lit.base10_parse().unwrap(); if int_as_hex { // if u8-range, use two digits, otherwise 16 if val > 255 { @@ -594,7 +594,7 @@ fn expr_stringified(expr: &Expr, int_as_hex: bool) -> String { val } Lit::Float(lit) => { - let val = lit.value(); + let val: f64 = lit.base10_parse().unwrap(); format!("{}", val) } _ => panic!(),