diff --git a/futures-join-macro/Cargo.toml b/futures-join-macro/Cargo.toml index 0c53d65759..10edfc71c7 100644 --- a/futures-join-macro/Cargo.toml +++ b/futures-join-macro/Cargo.toml @@ -18,7 +18,7 @@ proc-macro = true [features] [dependencies] -proc-macro2 = "0.4" +proc-macro2 = "1.0" proc-macro-hack = "0.5.3" -quote = "0.6" -syn = { version = "0.15.25", features = ["full"] } +quote = "1.0" +syn = { version = "1.0", features = ["full"] } diff --git a/futures-join-macro/src/lib.rs b/futures-join-macro/src/lib.rs index a17b1bd8be..08783a4a39 100644 --- a/futures-join-macro/src/lib.rs +++ b/futures-join-macro/src/lib.rs @@ -11,7 +11,7 @@ extern crate proc_macro; use proc_macro::TokenStream; use proc_macro2::{Span, TokenStream as TokenStream2}; use proc_macro_hack::proc_macro_hack; -use quote::quote; +use quote::{format_ident, quote}; use syn::parse::{Parse, ParseStream}; use syn::{parenthesized, parse_quote, Expr, Ident, Token}; @@ -61,7 +61,7 @@ fn bind_futures( .into_iter() .enumerate() .map(|(i, expr)| { - let name = Ident::new(&format!("_fut{}", i), span); + let name = format_ident!("_fut{}", i, span = span); future_let_bindings.push(quote! { // Move future into a local so that it is pinned in one place and // is no longer accessible by the end user. diff --git a/futures-select-macro/Cargo.toml b/futures-select-macro/Cargo.toml index 2147b02b84..ac4539365b 100644 --- a/futures-select-macro/Cargo.toml +++ b/futures-select-macro/Cargo.toml @@ -19,7 +19,7 @@ proc-macro = true std = [] [dependencies] -proc-macro2 = "0.4" +proc-macro2 = "1.0" proc-macro-hack = "0.5.3" -quote = "0.6" -syn = { version = "0.15.25", features = ["full"] } +quote = "1.0" +syn = { version = "1.0", features = ["full"] } diff --git a/futures-select-macro/src/lib.rs b/futures-select-macro/src/lib.rs index 2cc2a4c9a4..84d035011a 100644 --- a/futures-select-macro/src/lib.rs +++ b/futures-select-macro/src/lib.rs @@ -11,7 +11,7 @@ extern crate proc_macro; use proc_macro::TokenStream; use proc_macro2::Span; use proc_macro_hack::proc_macro_hack; -use quote::quote; +use quote::{format_ident, quote}; use syn::{parenthesized, parse_quote, Expr, Ident, Pat, Token}; use syn::parse::{Parse, ParseStream}; @@ -119,7 +119,7 @@ fn declare_result_enum( // "_0", "_1", "_2" let variant_names: Vec = (0..variants) - .map(|num| Ident::new(&format!("_{}", num), span)) + .map(|num| format_ident!("_{}", num, span = span)) .collect(); let type_parameters = &variant_names;