diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 7f151280b640755a1f251063b9be93034bd76048..f37f55a9788074e30bc5ba21c5ce7af8d43a78c3 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -4112,8 +4112,8 @@ dependencies = [
"criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 2.0.0",
"sr-version 2.0.0",
@@ -4122,7 +4122,7 @@ dependencies = [
"substrate-primitives 2.0.0",
"substrate-state-machine 2.0.0",
"substrate-test-runtime-client 2.0.0",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -4761,11 +4761,11 @@ dependencies = [
name = "srml-support-procedural"
version = "2.0.0"
dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-api-macros 2.0.0",
"srml-support-procedural-tools 2.0.0",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -4773,19 +4773,19 @@ name = "srml-support-procedural-tools"
version = "2.0.0"
dependencies = [
"proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"srml-support-procedural-tools-derive 2.0.0",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "srml-support-procedural-tools-derive"
version = "2.0.0"
dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
diff --git a/substrate/core/chain-spec/derive/Cargo.toml b/substrate/core/chain-spec/derive/Cargo.toml
index 2e42ca0cf3a7095866f17d81830fce84ebb82c21..9fb8eabc608444dbbb4a52684e35d8ee1a28ffa4 100644
--- a/substrate/core/chain-spec/derive/Cargo.toml
+++ b/substrate/core/chain-spec/derive/Cargo.toml
@@ -9,8 +9,8 @@ proc-macro = true
[dependencies]
proc-macro-crate = "0.1.4"
-proc-macro2 = "1.0.4"
+proc-macro2 = "1.0.6"
quote = "1.0.2"
-syn = "1.0.5"
+syn = "1.0.7"
[dev-dependencies]
diff --git a/substrate/core/primitives/debug-derive/Cargo.toml b/substrate/core/primitives/debug-derive/Cargo.toml
index 9c7b7aa1bad4908e5949e3f9ed667b153cdd62d7..a7bf90695ab932e7fe2e5f44b3437f13bb3cd2ca 100644
--- a/substrate/core/primitives/debug-derive/Cargo.toml
+++ b/substrate/core/primitives/debug-derive/Cargo.toml
@@ -9,7 +9,7 @@ proc-macro = true
[dependencies]
quote = "1.0.2"
-syn = "1.0.5"
+syn = "1.0.7"
proc-macro2 = "1.0"
[features]
diff --git a/substrate/core/sr-api-macros/Cargo.toml b/substrate/core/sr-api-macros/Cargo.toml
index 022536136b80e31529bfdff4de71ac7ae40ae64a..ad258fcf67c66e8035151e178fc30b55a3c60999 100644
--- a/substrate/core/sr-api-macros/Cargo.toml
+++ b/substrate/core/sr-api-macros/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2018"
proc-macro = true
[dependencies]
-quote = "0.6.12"
-syn = { version = "0.15.44", features = [ "full", "fold", "extra-traits", "visit" ] }
-proc-macro2 = "0.4.27"
+quote = "1.0.2"
+syn = { version = "1.0.7", features = [ "full", "fold", "extra-traits", "visit" ] }
+proc-macro2 = "1.0.6"
blake2-rfc = "0.2.18"
proc-macro-crate = "0.1.4"
diff --git a/substrate/core/sr-api-macros/src/decl_runtime_apis.rs b/substrate/core/sr-api-macros/src/decl_runtime_apis.rs
index 12639bd1c1f17c22b807f7455113511ae80b996c..778ac910cd93f796eac8c1f49f0f9c38ad56f765 100644
--- a/substrate/core/sr-api-macros/src/decl_runtime_apis.rs
+++ b/substrate/core/sr-api-macros/src/decl_runtime_apis.rs
@@ -19,6 +19,7 @@ use crate::utils::{
fold_fn_decl_for_client_side, unwrap_or_error, extract_parameter_names_types_and_borrows,
generate_native_call_generator_fn_name, return_type_extract_type,
generate_method_runtime_api_impl_name, generate_call_api_at_fn_name, prefix_function_with_trait,
+ replace_wild_card_parameter_names,
};
use proc_macro2::{TokenStream, Span};
@@ -27,9 +28,8 @@ use quote::quote;
use syn::{
spanned::Spanned, parse_macro_input, parse::{Parse, ParseStream, Result, Error}, ReturnType,
- fold::{self, Fold}, parse_quote, ItemTrait, Generics, GenericParam, Attribute, FnArg,
- visit::{Visit, self}, Pat, TraitBound, Meta, NestedMeta, Lit, TraitItem, Ident, Type,
- TraitItemMethod
+ fold::{self, Fold}, parse_quote, ItemTrait, Generics, GenericParam, Attribute, FnArg, Type,
+ visit::{Visit, self}, TraitBound, Meta, NestedMeta, Lit, TraitItem, Ident, TraitItemMethod,
};
use std::collections::HashMap;
@@ -95,9 +95,9 @@ impl Parse for RuntimeApiDecls {
fn extend_generics_with_block(generics: &mut Generics) {
let c = generate_crate_access(HIDDEN_INCLUDES_ID);
- generics.lt_token = Some(parse_quote!(<));
+ generics.lt_token = Some(Default::default());
generics.params.insert(0, parse_quote!( Block: #c::runtime_api::BlockT ));
- generics.gt_token = Some(parse_quote!(>));
+ generics.gt_token = Some(Default::default());
}
/// Remove all attributes from the vector that are supported by us in the declaration of a runtime
@@ -182,7 +182,7 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
// Auxiliary function that is used to convert between types that use different block types.
- // The function expects that both a convertable by encoding the one and decoding the other.
+ // The function expects that both are convertible by encoding the one and decoding the other.
result.push(quote!(
#[cfg(any(feature = "std", test))]
fn convert_between_block_types
@@ -198,10 +198,10 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
// Generate a native call generator for each function of the given trait.
for fn_ in fns {
- let params = extract_parameter_names_types_and_borrows(&fn_.decl)?;
+ let params = extract_parameter_names_types_and_borrows(&fn_)?;
let trait_fn_name = &fn_.ident;
let fn_name = generate_native_call_generator_fn_name(&fn_.ident);
- let output = return_type_replace_block_with_node_block(fn_.decl.output.clone());
+ let output = return_type_replace_block_with_node_block(fn_.output.clone());
let output_ty = return_type_extract_type(&output);
let output = quote!( std::result::Result<#output_ty, String> );
@@ -217,7 +217,7 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
});
// Same as for the input types, we need to check if we also need to convert the output,
// before returning it.
- let output_conversion = if return_type_is_using_block(&fn_.decl.output) {
+ let output_conversion = if return_type_is_using_block(&fn_.output) {
quote!(
convert_between_block_types(
&res,
@@ -234,22 +234,21 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
// the user. Otherwise if it is not using the block, we don't need to add anything.
let input_borrows = params
.iter()
- .map(|v| if type_is_using_block(&v.1) { v.2.clone() } else { quote!() });
+ .map(|v| if type_is_using_block(&v.1) { v.2.clone() } else { None });
// Replace all `Block` with `NodeBlock`, add `'a` lifetime to references and collect
// all the function inputs.
let fn_inputs = fn_
- .decl
.inputs
.iter()
.map(|v| fn_arg_replace_block_with_node_block(v.clone()))
.map(|v| match v {
- FnArg::Captured(ref arg) => {
+ FnArg::Typed(ref arg) => {
let mut arg = arg.clone();
- if let Type::Reference(ref mut r) = arg.ty {
+ if let Type::Reference(ref mut r) = *arg.ty {
r.lifetime = Some(parse_quote!( 'a ));
}
- FnArg::Captured(arg)
+ FnArg::Typed(arg)
},
r => r.clone(),
});
@@ -310,15 +309,15 @@ fn parse_renamed_attribute(renamed: &Attribute) -> Result<(String, u32)> {
} else {
let mut itr = list.nested.iter();
let old_name = match itr.next() {
- Some(NestedMeta::Literal(Lit::Str(i))) => {
+ Some(NestedMeta::Lit(Lit::Str(i))) => {
i.value()
},
_ => return err,
};
let version = match itr.next() {
- Some(NestedMeta::Literal(Lit::Int(i))) => {
- i.value() as u32
+ Some(NestedMeta::Lit(Lit::Int(i))) => {
+ i.base10_parse()?
},
_ => return err,
};
@@ -488,6 +487,8 @@ fn generate_runtime_decls(decls: &[ItemTrait]) -> TokenStream {
if remove_supported_attributes(&mut method.attrs).contains_key(CHANGED_IN_ATTRIBUTE) {
None
} else {
+ // Make sure we replace all the wild card parameter names.
+ replace_wild_card_parameter_names(&mut method.sig);
Some(TraitItem::Method(method.clone()))
}
}
@@ -565,7 +566,7 @@ impl<'a> ToClientSideDecl<'a> {
let context_arg: syn::FnArg = parse_quote!( context: #crate_::runtime_api::ExecutionContext );
let mut fn_decl_ctx = self.create_method_decl(method, quote!( context ));
fn_decl_ctx.sig.ident = Ident::new(&format!("{}_with_context", &fn_decl_ctx.sig.ident), Span::call_site());
- fn_decl_ctx.sig.decl.inputs.insert(2, context_arg);
+ fn_decl_ctx.sig.inputs.insert(2, context_arg);
fn_decl_ctx
}
@@ -577,12 +578,12 @@ impl<'a> ToClientSideDecl<'a> {
return None;
}
- let fn_decl = &method.sig.decl;
- let ret_type = return_type_extract_type(&fn_decl.output);
+ let fn_sig = &method.sig;
+ let ret_type = return_type_extract_type(&fn_sig.output);
// Get types and if the value is borrowed from all parameters.
// If there is an error, we push it as the block to the user.
- let param_types = match extract_parameter_names_types_and_borrows(fn_decl) {
+ let param_types = match extract_parameter_names_types_and_borrows(fn_sig) {
Ok(res) => res.into_iter().map(|v| {
let ty = v.1;
let borrow = v.2;
@@ -614,8 +615,12 @@ impl<'a> ToClientSideDecl<'a> {
/// Takes the method declared by the user and creates the declaration we require for the runtime
/// api client side. This method will call by default the `method_runtime_api_impl` for doing
/// the actual call into the runtime.
- fn create_method_decl(&mut self, mut method: TraitItemMethod, context: TokenStream) -> TraitItemMethod {
- let params = match extract_parameter_names_types_and_borrows(&method.sig.decl) {
+ fn create_method_decl(
+ &mut self,
+ mut method: TraitItemMethod,
+ context: TokenStream,
+ ) -> TraitItemMethod {
+ let params = match extract_parameter_names_types_and_borrows(&method.sig) {
Ok(res) => res.into_iter().map(|v| v.0).collect::<Vec<_>>(),
Err(e) => {
self.errors.push(e.to_compile_error());
@@ -623,13 +628,10 @@ impl<'a> ToClientSideDecl<'a> {
}
};
let params2 = params.clone();
- let ret_type = return_type_extract_type(&method.sig.decl.output);
+ let ret_type = return_type_extract_type(&method.sig.output);
+
+ fold_fn_decl_for_client_side(&mut method.sig, &self.block_id, &self.crate_);
- method.sig.decl = fold_fn_decl_for_client_side(
- method.sig.decl.clone(),
- &self.block_id,
- &self.crate_
- );
let name_impl = generate_method_runtime_api_impl_name(&self.trait_, &method.sig.ident);
let crate_ = self.crate_;
@@ -650,7 +652,7 @@ impl<'a> ToClientSideDecl<'a> {
let ident = Ident::new(
&format!("{}_before_version_{}", method.sig.ident, version),
- method.sig.ident.span()
+ method.sig.ident.span(),
);
method.sig.ident = ident;
method.attrs.push(parse_quote!( #[deprecated] ));
@@ -674,22 +676,26 @@ impl<'a> ToClientSideDecl<'a> {
let runtime_api_impl_params_encoded =
#crate_::runtime_api::Encode::encode(&( #( &#params ),* ));
- self.#name_impl(at, #context, #param_tuple, runtime_api_impl_params_encoded)
- .and_then(|r|
- match r {
- #crate_::runtime_api::NativeOrEncoded::Native(n) => {
- #native_handling
- },
- #crate_::runtime_api::NativeOrEncoded::Encoded(r) => {
- <#ret_type as #crate_::runtime_api::Decode>::decode(&mut &r[..])
- .map_err(|err|
- #crate_::error::Error::CallResultDecode(
- #function_name, err
- ).into()
- )
- }
+ self.#name_impl(
+ __runtime_api_at_param__,
+ #context,
+ #param_tuple,
+ runtime_api_impl_params_encoded,
+ ).and_then(|r|
+ match r {
+ #crate_::runtime_api::NativeOrEncoded::Native(n) => {
+ #native_handling
+ },
+ #crate_::runtime_api::NativeOrEncoded::Encoded(r) => {
+ <#ret_type as #crate_::runtime_api::Decode>::decode(&mut &r[..])
+ .map_err(|err|
+ #crate_::error::Error::CallResultDecode(
+ #function_name, err
+ ).into()
+ )
}
- )
+ }
+ )
}
}
);
@@ -745,15 +751,12 @@ fn parse_runtime_api_version(version: &Attribute) -> Result<u64> {
match meta {
Meta::List(list) => {
- if list.nested.len() > 1 && list.nested.is_empty() {
+ if list.nested.len() != 1 {
err
+ } else if let Some(NestedMeta::Lit(Lit::Int(i))) = list.nested.first() {
+ i.base10_parse()
} else {
- match list.nested.first().as_ref().map(|v| v.value()) {
- Some(NestedMeta::Literal(Lit::Int(i))) => {
- Ok(i.value())
- },
- _ => err,
- }
+ err
}
},
_ => err,
@@ -848,32 +851,8 @@ struct CheckTraitDecl {
impl<'ast> Visit<'ast> for CheckTraitDecl {
fn visit_fn_arg(&mut self, input: &'ast FnArg) {
- match input {
- FnArg::Captured(ref arg) => {
- match arg.pat {
- Pat::Ident(ref pat) if pat.ident == "at" => {
- self.errors.push(
- Error::new(
- pat.span(),
- "`decl_runtime_apis!` adds automatically a parameter \
- `at: &BlockId<Block>`. Please rename/remove your parameter."
- )
- )
- },
- _ => {}
- }
- },
- FnArg::SelfRef(_) | FnArg::SelfValue(_) => {
- self.errors.push(Error::new(input.span(), "Self values are not supported."))
- }
- _ => {
- self.errors.push(
- Error::new(
- input.span(),
- "Only function arguments in the form `pat: type` are supported."
- )
- )
- }
+ if let FnArg::Receiver(_) = input {
+ self.errors.push(Error::new(input.span(), "`self` as argument not supported."))
}
visit::visit_fn_arg(self, input);
@@ -897,7 +876,7 @@ impl<'ast> Visit<'ast> for CheckTraitDecl {
}
fn visit_trait_bound(&mut self, input: &'ast TraitBound) {
- if let Some(last_ident) = input.path.segments.last().map(|v| &v.value().ident) {
+ if let Some(last_ident) = input.path.segments.last().map(|v| &v.ident) {
if last_ident == "BlockT" || last_ident == BLOCK_GENERIC_IDENT {
self.errors.push(
Error::new(
diff --git a/substrate/core/sr-api-macros/src/impl_runtime_apis.rs b/substrate/core/sr-api-macros/src/impl_runtime_apis.rs
index 42d653b1abd9782fb96928a8ec12990a7dc4f112..d77d46a43cd44fe2f6b12e06b4417ac11890364b 100644
--- a/substrate/core/sr-api-macros/src/impl_runtime_apis.rs
+++ b/substrate/core/sr-api-macros/src/impl_runtime_apis.rs
@@ -26,7 +26,7 @@ use proc_macro2::{Span, TokenStream};
use quote::quote;
use syn::{
- spanned::Spanned, parse_macro_input, Ident, Type, ItemImpl, MethodSig, Path,
+ spanned::Spanned, parse_macro_input, Ident, Type, ItemImpl, Path, Signature,
ImplItem, parse::{Parse, ParseStream, Result, Error}, PathArguments, GenericArgument, TypePath,
fold::{self, Fold}, parse_quote
};
@@ -56,12 +56,12 @@ impl Parse for RuntimeApiImpls {
/// Generates the call to the implementation of the requested function.
/// The generated code includes decoding of the input arguments and encoding of the output.
fn generate_impl_call(
- signature: &MethodSig,
+ signature: &Signature,
runtime: &Type,
input: &Ident,
impl_trait: &Path
) -> Result<TokenStream> {
- let params = extract_parameter_names_types_and_borrows(&signature.decl)?;
+ let params = extract_parameter_names_types_and_borrows(signature)?;
let c = generate_crate_access(HIDDEN_INCLUDES_ID);
let c_iter = iter::repeat(&c);
@@ -110,23 +110,20 @@ fn extract_impl_trait<'a>(impl_: &'a ItemImpl) -> Result<&'a Path> {
/// Extracts the runtime block identifier.
fn extract_runtime_block_ident(trait_: &Path) -> Result<&TypePath> {
let span = trait_.span();
- let segment = trait_
+ let generics = trait_
.segments
.last()
- .ok_or_else(
- || Error::new(span, "Empty path not supported")
- )?;
- let generics = segment.value();
+ .ok_or_else(|| Error::new(span, "Empty path not supported"))?;
match &generics.arguments {
PathArguments::AngleBracketed(ref args) => {
- args.args.first().and_then(|v| match v.value() {
- GenericArgument::Type(Type::Path(block)) => Some(block),
+ args.args.first().and_then(|v| match v {
+ GenericArgument::Type(Type::Path(ref block)) => Some(block),
_ => None
}).ok_or_else(|| Error::new(args.span(), "Missing `Block` generic parameter."))
},
PathArguments::None => {
- let span = trait_.segments.last().as_ref().unwrap().value().span();
+ let span = trait_.segments.last().as_ref().unwrap().span();
Err(Error::new(span, "Missing `Block` generic parameter."))
},
PathArguments::Parenthesized(_) => {
@@ -149,7 +146,6 @@ fn generate_impl_calls(
.segments
.last()
.ok_or_else(|| Error::new(impl_trait_path.span(), "Empty trait path not possible!"))?
- .value()
.ident;
for item in &impl_.items {
@@ -363,7 +359,7 @@ fn generate_runtime_api_base_structures(impls: &[ItemImpl]) -> Result<TokenStrea
res
}
- fn commit_on_ok<R, E>(&self, res: &::std::result::Result<R, E>) {
+ fn commit_on_ok<R, E>(&self, res: &std::result::Result<R, E>) {
if *self.commit_on_success.borrow() {
if res.is_err() {
self.changes.borrow_mut().discard_prospective();
@@ -385,7 +381,6 @@ fn extend_with_runtime_decl_path(mut trait_: Path) -> Path {
.last()
.as_ref()
.expect("Trait path should always contain at least one item; qed")
- .value()
.ident;
generate_runtime_mod_name_for_trait(trait_name)
@@ -455,16 +450,16 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
let block_id = self.node_block_id;
// Generate the access to the native parameters
- let param_tuple_access = if input.sig.decl.inputs.len() == 1 {
+ let param_tuple_access = if input.sig.inputs.len() == 1 {
vec![ quote!( p ) ]
} else {
- input.sig.decl.inputs.iter().enumerate().map(|(i, _)| {
+ input.sig.inputs.iter().enumerate().map(|(i, _)| {
let i = syn::Index::from(i);
quote!( p.#i )
}).collect::<Vec<_>>()
};
- let (param_types, error) = match extract_parameter_names_types_and_borrows(&input.sig.decl) {
+ let (param_types, error) = match extract_parameter_names_types_and_borrows(&input.sig) {
Ok(res) => (
res.into_iter().map(|v| {
let ty = v.1;
@@ -476,18 +471,23 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
Err(e) => (Vec::new(), Some(e.to_compile_error())),
};
- let context_arg: syn::FnArg = parse_quote!( context: #crate_::runtime_api::ExecutionContext );
-
// Rewrite the input parameters.
- input.sig.decl.inputs = parse_quote! {
- &self, at: &#block_id, #context_arg, params: Option<( #( #param_types ),* )>, params_encoded: Vec<u8>
+ input.sig.inputs = parse_quote! {
+ &self,
+ at: &#block_id,
+ context: #crate_::runtime_api::ExecutionContext,
+ params: Option<( #( #param_types ),* )>,
+ params_encoded: Vec<u8>,
};
- input.sig.ident = generate_method_runtime_api_impl_name(&self.impl_trait, &input.sig.ident);
- let ret_type = return_type_extract_type(&input.sig.decl.output);
+ input.sig.ident = generate_method_runtime_api_impl_name(
+ &self.impl_trait,
+ &input.sig.ident,
+ );
+ let ret_type = return_type_extract_type(&input.sig.output);
// Generate the correct return type.
- input.sig.decl.output = parse_quote!(
+ input.sig.output = parse_quote!(
-> #crate_::error::Result<#crate_::runtime_api::NativeOrEncoded<#ret_type>>
);
@@ -495,7 +495,7 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
parse_quote!(
{
// Get the error to the user (if we have one).
- #( #error )*
+ #error
self.call_api_at(
|call_runtime_at, core_api, changes, initialized_block, recorder| {
@@ -556,7 +556,7 @@ fn generate_api_impl_for_runtime_api(impls: &[ItemImpl]) -> Result<TokenStream>
.segments
.last()
.ok_or_else(|| Error::new(impl_trait_path.span(), "Empty trait path not possible!"))?
- .into_value();
+ .clone();
let runtime_block = extract_runtime_block_ident(impl_trait_path)?;
let (node_block, node_block_id) = generate_node_block_and_block_id_ty(&impl_.self_ty);
let runtime_type = &impl_.self_ty;
diff --git a/substrate/core/sr-api-macros/src/utils.rs b/substrate/core/sr-api-macros/src/utils.rs
index 21000f431b81505979f6c158a694fcd44aa2f98b..c627cdacfa982017ee17ed37775b6219ddaaae56 100644
--- a/substrate/core/sr-api-macros/src/utils.rs
+++ b/substrate/core/sr-api-macros/src/utils.rs
@@ -15,9 +15,15 @@
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use proc_macro2::{TokenStream, Span};
-use syn::{Result, Ident, FnDecl, parse_quote, Type, Pat, spanned::Spanned, FnArg, Error};
+
+use syn::{
+ Result, Ident, Signature, parse_quote, Type, Pat, spanned::Spanned, FnArg, Error, token::And,
+};
+
use quote::quote;
+
use std::env;
+
use proc_macro_crate::crate_name;
/// Unwrap the given result, if it is an error, `compile_error!` will be generated.
@@ -82,23 +88,33 @@ pub fn return_type_extract_type(rt: &syn::ReturnType) -> Type {
}
}
-/// Fold the given `FnDecl` to make it usable on the client side.
+/// Replace the `_` (wild card) parameter names in the given signature with unique identifiers.
+pub fn replace_wild_card_parameter_names(input: &mut Signature) {
+ let mut generated_pattern_counter = 0;
+ input.inputs.iter_mut().for_each(|arg| if let FnArg::Typed(arg) = arg {
+ arg.pat = Box::new(
+ generate_unique_pattern((*arg.pat).clone(), &mut generated_pattern_counter),
+ );
+ });
+}
+
+/// Fold the given `Signature` to make it usable on the client side.
pub fn fold_fn_decl_for_client_side(
- mut input: FnDecl,
+ input: &mut Signature,
block_id: &TokenStream,
- crate_: &TokenStream
-) -> FnDecl {
+ crate_: &TokenStream,
+) {
+ replace_wild_card_parameter_names(input);
+
// Add `&self, at:& BlockId` as parameters to each function at the beginning.
- input.inputs.insert(0, parse_quote!( at: &#block_id ));
+ input.inputs.insert(0, parse_quote!( __runtime_api_at_param__: &#block_id ));
input.inputs.insert(0, parse_quote!( &self ));
// Wrap the output in a `Result`
input.output = {
let ty = return_type_extract_type(&input.output);
- parse_quote!( -> ::std::result::Result<#ty, #crate_::error::Error> )
+ parse_quote!( -> std::result::Result<#ty, #crate_::error::Error> )
};
-
- input
}
/// Generate an unique pattern based on the given counter, if the given pattern is a `_`.
@@ -106,8 +122,8 @@ pub fn generate_unique_pattern(pat: Pat, counter: &mut u32) -> Pat {
match pat {
Pat::Wild(_) => {
let generated_name = Ident::new(
- &format!("runtime_api_generated_name_{}", counter),
- pat.span()
+ &format!("__runtime_api_generated_name_{}__", counter),
+ pat.span(),
);
*counter += 1;
@@ -115,38 +131,31 @@ pub fn generate_unique_pattern(pat: Pat, counter: &mut u32) -> Pat {
},
_ => pat,
}
-}
+ }
/// Extracts the name, the type and `&` or ``(if it is a reference or not)
-/// for each parameter in the given function declaration.
-pub fn extract_parameter_names_types_and_borrows(fn_decl: &FnDecl)
- -> Result<Vec<(Pat, Type, TokenStream)>>
+/// for each parameter in the given function signature.
+pub fn extract_parameter_names_types_and_borrows(sig: &Signature)
+ -> Result<Vec<(Pat, Type, Option<And>)>>
{
let mut result = Vec::new();
let mut generated_pattern_counter = 0;
- for input in fn_decl.inputs.iter() {
+ for input in sig.inputs.iter() {
match input {
- FnArg::Captured(arg) => {
- let (ty, borrow) = match &arg.ty {
+ FnArg::Typed(arg) => {
+ let (ty, borrow) = match &*arg.ty {
Type::Reference(t) => {
- let ty = &t.elem;
- (parse_quote!( #ty ), quote!( & ))
+ ((*t.elem).clone(), Some(t.and_token))
},
- t => { (t.clone(), quote!()) },
+ t => { (t.clone(), None) },
};
let name =
- generate_unique_pattern(arg.pat.clone(), &mut generated_pattern_counter);
+ generate_unique_pattern((*arg.pat).clone(), &mut generated_pattern_counter);
result.push((name, ty, borrow));
},
- _ => {
- return Err(
- Error::new(
- input.span(),
- "Only function arguments with the following \
- pattern are accepted: `name: type`!"
- )
- )
+ FnArg::Receiver(_) => {
+ return Err(Error::new(input.span(), "`self` parameter not supported!"))
}
}
}
diff --git a/substrate/core/sr-api-macros/tests/decl_and_impl.rs b/substrate/core/sr-api-macros/tests/decl_and_impl.rs
index a539d838221be1409b5bd8ae8ebb451382ef82b0..314c92e28d02e57573c54e80af6ca745a6edc455 100644
--- a/substrate/core/sr-api-macros/tests/decl_and_impl.rs
+++ b/substrate/core/sr-api-macros/tests/decl_and_impl.rs
@@ -33,6 +33,7 @@ decl_runtime_apis! {
fn something_with_block(block: Block) -> Block;
fn function_with_two_args(data: u64, block: Block);
fn same_name();
+ fn wild_card(_: u32);
}
#[api_version(2)]
@@ -58,6 +59,8 @@ impl_runtime_apis! {
}
fn same_name() {}
+
+ fn wild_card(_: u32) {}
}
impl self::ApiWithCustomVersion<Block> for Runtime {
diff --git a/substrate/core/sr-api-macros/tests/ui/adding_at_parameter.rs b/substrate/core/sr-api-macros/tests/ui/adding_at_parameter.rs
deleted file mode 100644
index d4757e256f024514613090300169440258d70ee3..0000000000000000000000000000000000000000
--- a/substrate/core/sr-api-macros/tests/ui/adding_at_parameter.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use client::decl_runtime_apis;
-
-decl_runtime_apis! {
- pub trait Api {
- fn test(at: u64);
- }
-}
-
-fn main() {}
diff --git a/substrate/core/sr-api-macros/tests/ui/adding_at_parameter.stderr b/substrate/core/sr-api-macros/tests/ui/adding_at_parameter.stderr
deleted file mode 100644
index 1c7e07a418c0a250b57e5a758b8ec4678d415f34..0000000000000000000000000000000000000000
--- a/substrate/core/sr-api-macros/tests/ui/adding_at_parameter.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: `decl_runtime_apis!` adds automatically a parameter `at: &BlockId<Block>`. Please rename/remove your parameter.
- --> $DIR/adding_at_parameter.rs:5:11
- |
-5 | fn test(at: u64);
- | ^^
diff --git a/substrate/core/sr-api-macros/tests/ui/adding_self_parameter.stderr b/substrate/core/sr-api-macros/tests/ui/adding_self_parameter.stderr
index e7249e9f732f55fe84707266da3eac32d3835141..34ba4d4a5112fc00ff0a4a36367a0b389cac3aee 100644
--- a/substrate/core/sr-api-macros/tests/ui/adding_self_parameter.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/adding_self_parameter.stderr
@@ -1,4 +1,4 @@
-error: Self values are not supported.
+error: `self` as argument not supported.
--> $DIR/adding_self_parameter.rs:5:11
|
5 | fn test(&self);
diff --git a/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index f3abaddd6ea9d757ae1b132a9274c068bc6814c6..b2b024ee7fe1e9ca319a0d9a8a70586812e1e518 100644
--- a/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -40,3 +40,15 @@ error[E0308]: mismatched types
|
= note: expected type `u64`
found type `&u64`
+
+error[E0308]: mismatched types
+ --> $DIR/type_reference_in_impl_runtime_apis_call.rs:20:11
+ |
+20 | fn test(data: &u64) {
+ | ^^^^^^^
+ | |
+ | expected u64, found &u64
+ | help: consider removing the borrow: `data`
+ |
+ = note: expected type `u64`
+ found type `&u64`
diff --git a/substrate/srml/staking/reward-curve/Cargo.toml b/substrate/srml/staking/reward-curve/Cargo.toml
index 4fb0ab1672ce0ce670db4a4a8c7f50c63fec1086..b33323a5e319073c2c1a2534e02dba3527e5bfc2 100644
--- a/substrate/srml/staking/reward-curve/Cargo.toml
+++ b/substrate/srml/staking/reward-curve/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2018"
proc-macro = true
[dependencies]
-syn = { version = "1.0", features = [ "full", "visit" ] }
+syn = { version = "1.0.7", features = [ "full", "visit" ] }
quote = "1.0"
-proc-macro2 = "1.0.4"
+proc-macro2 = "1.0.6"
proc-macro-crate = "0.1.4"
[dev-dependencies]
diff --git a/substrate/srml/support/procedural/Cargo.toml b/substrate/srml/support/procedural/Cargo.toml
index 91b4ca507497e69b862397df510f359264857845..b891e7b46ff7f14dd69f7bc3b1013aaf320fac7f 100644
--- a/substrate/srml/support/procedural/Cargo.toml
+++ b/substrate/srml/support/procedural/Cargo.toml
@@ -11,6 +11,6 @@ proc-macro = true
srml-support-procedural-tools = { package = "srml-support-procedural-tools", path = "./tools" }
sr-api-macros = { path = "../../../core/sr-api-macros" }
-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"] }
diff --git a/substrate/srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/substrate/srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index f9d2f8abe8055a8128ba1ef222f5e5342ba1b138..8944a924724a9969b5fdff575bd3bf7e5b88d4fe 100644
--- a/substrate/srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/substrate/srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -124,7 +124,7 @@ impl GenesisConfigDef {
for line in &def.extra_genesis_config_lines {
let doc = line.attrs.iter()
.filter_map(|a| a.parse_meta().ok())
- .filter(|m| m.name() == "doc")
+ .filter(|m| m.path().is_ident("doc"))
.collect();
let default = line.default.as_ref().map(|e| quote!( #e ))
diff --git a/substrate/srml/support/procedural/src/storage/metadata.rs b/substrate/srml/support/procedural/src/storage/metadata.rs
index e280c7d8a20c6c45fc88eb25d7cd1af4905094cc..f81da84c74c6694604e325453802d0a24129200a 100644
--- a/substrate/srml/support/procedural/src/storage/metadata.rs
+++ b/substrate/srml/support/procedural/src/storage/metadata.rs
@@ -175,7 +175,7 @@ pub fn impl_metadata(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
let mut docs = TokenStream::new();
for attr in line.attrs.iter().filter_map(|v| v.parse_meta().ok()) {
if let syn::Meta::NameValue(meta) = attr {
- if meta.ident == "doc" {
+ if meta.path.is_ident("doc") {
let lit = meta.lit;
docs.extend(quote!(#lit,));
}
diff --git a/substrate/srml/support/procedural/src/storage/mod.rs b/substrate/srml/support/procedural/src/storage/mod.rs
index 9a6931d87e9c8eef5a2a46b506d12a989877a144..bdbef49d2776ab80a3021fb9bdde9440d8f0d99e 100644
--- a/substrate/srml/support/procedural/src/storage/mod.rs
+++ b/substrate/srml/support/procedural/src/storage/mod.rs
@@ -307,7 +307,7 @@ impl StorageLineDefExt {
let doc_attrs = storage_def.attrs.iter()
.filter_map(|a| a.parse_meta().ok())
- .filter(|m| m.name() == "doc")
+ .filter(|m| m.path().is_ident("doc"))
.collect();
Self {
diff --git a/substrate/srml/support/procedural/tools/Cargo.toml b/substrate/srml/support/procedural/tools/Cargo.toml
index 62c55a703f4ed23b51b3c9da224fd045cbd79aeb..4c5726c202521f52096dbd7d494ad40ea7f46a20 100644
--- a/substrate/srml/support/procedural/tools/Cargo.toml
+++ b/substrate/srml/support/procedural/tools/Cargo.toml
@@ -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"
diff --git a/substrate/srml/support/procedural/tools/derive/Cargo.toml b/substrate/srml/support/procedural/tools/derive/Cargo.toml
index 54bfaba83843414387a95a713a30f6172f95abef..acc0c1b1d336780deb4970649c6b26095e93612c 100644
--- a/substrate/srml/support/procedural/tools/derive/Cargo.toml
+++ b/substrate/srml/support/procedural/tools/derive/Cargo.toml
@@ -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"] }
diff --git a/substrate/srml/support/procedural/tools/src/syn_ext.rs b/substrate/srml/support/procedural/tools/src/syn_ext.rs
index 1658a6b4aea25caabe196066885b6b5c82202af4..39cfb0ee1cf2f8f42f67faf4b125087d21b510ee 100644
--- a/substrate/srml/support/procedural/tools/src/syn_ext.rs
+++ b/substrate/srml/support/procedural/tools/src/syn_ext.rs
@@ -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);
}
}