pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 12:51:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update syn, proc-macro2 and quote to 1.x (#4028)

Browse Source
This commit is contained in:
Bastian Köcher
2019-11-06 14:00:49 +01:00
committed by GitHub
parent cc09bfbd09
commit b484c4fbc0
20 changed files with 177 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/support/procedural/tools/Cargo.toml
+3 -3
View File
@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
srml-support-procedural-tools-derive = { package = "srml-support-procedural-tools-derive", path = "./derive" }
proc-macro2 = "0.4.27"
quote = "0.6.12"
syn = { version = "0.15.44", features = ["full"] }
proc-macro2 = "1.0.6"
quote = "1.0.2"
syn = { version = "1.0.7", features = ["full"] }
proc-macro-crate = "0.1.4"
substrate/srml/support/procedural/tools/derive/Cargo.toml
+3 -3
View File
@@ -8,6 +8,6 @@ edition = "2018"
proc-macro = true
[dependencies]
proc-macro2 = "0.4.27"
quote = { version = "0.6.12", features = ["proc-macro"] }
syn = { version = "0.15.44", features = ["proc-macro" ,"full", "extra-traits", "parsing"] }
proc-macro2 = "1.0.6"
quote = { version = "1.0.2", features = ["proc-macro"] }
syn = { version = "1.0.7", features = ["proc-macro" ,"full", "extra-traits", "parsing"] }
substrate/srml/support/procedural/tools/src/syn_ext.rs
+6 -12
View File
@@ -20,7 +20,7 @@
use syn::{visit::{Visit, self}, parse::{Parse, ParseStream, Result}, Ident};
use proc_macro2::{TokenStream, TokenTree};
use quote::{ToTokens, quote};
use quote::ToTokens;
use std::iter::once;
use srml_support_procedural_tools_derive::{ToTokens, Parse};
@@ -124,13 +124,7 @@ impl Parse for Meta {
impl ToTokens for Meta {
fn to_tokens(&self, tokens: &mut TokenStream) {
match self.inner {
syn::Meta::Word(ref ident) => {
let ident = ident.clone();
let toks = quote!{
#[#ident]
};
tokens.extend(toks);
},
syn::Meta::Path(ref path) => path.to_tokens(tokens),
syn::Meta::List(ref l) => l.to_tokens(tokens),
syn::Meta::NameValue(ref n) => n.to_tokens(tokens),
}
@@ -187,10 +181,10 @@ impl<P: ToTokens> ToTokens for Opt<P> {
pub fn extract_type_option(typ: &syn::Type) -> Option<syn::Type> {
if let syn::Type::Path(ref path) = typ {
let v = path.path.segments.last()?;
if v.value().ident == "Option" {
if v.ident == "Option" {
// Option has only one type argument in angle bracket.
if let syn::PathArguments::AngleBracketed(a) = &v.value().arguments {
if let syn::GenericArgument::Type(typ) = a.args.last()?.value() {
if let syn::PathArguments::AngleBracketed(a) = &v.arguments {
if let syn::GenericArgument::Type(typ) = a.args.last()? {
return Some(typ.clone())
}
}
@@ -230,7 +224,7 @@ impl<'ast> Visit<'ast> for ContainsIdent<'ast> {
}
fn visit_macro(&mut self, input: &'ast syn::Macro) {
self.visit_tokenstream(input.tts.clone());
self.visit_tokenstream(input.tokens.clone());
visit::visit_macro(self, input);
}
}