Fix issues related to Rust 2018, Macros, and node-template (#1742)

* Initial fix, need to remove demo

* Fix similar issue with contracts module

* Remove Demo Module for Testing

* Undo changes to Contracts module
This commit is contained in:
Shawn Tabrizi
2019-02-08 14:31:05 +01:00
committed by Gav Wood
parent 0135afd0ed
commit 7b0f82b4f0
4 changed files with 9 additions and 9 deletions
+5 -5
View File
@@ -147,7 +147,7 @@ macro_rules! __decl_generic_event {
$(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*;
Events { $( $events:tt )* };
) => {
__decl_generic_event!(
$crate::__decl_generic_event!(
$( #[ $attr ] )*;
$event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -165,7 +165,7 @@ macro_rules! __decl_generic_event {
$( $parsed_generic_params:ident ),*;
$( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*;
) => {
__decl_generic_event!(
$crate::__decl_generic_event!(
$( #[ $attr ] )*;
$event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -181,7 +181,7 @@ macro_rules! __decl_generic_event {
$(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*;
Events { $( $events:tt )* };
) => {
__decl_generic_event!(
$crate::__decl_generic_event!(
$( #[ $attr ] )*;
$event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -199,7 +199,7 @@ macro_rules! __decl_generic_event {
$( $parsed_generic_params:ident ),*;
$( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*;
) => {
__decl_generic_event!(
$crate::__decl_generic_event!(
$( #[ $attr ] )*;
$event_generic_param;
$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -247,7 +247,7 @@ macro_rules! __events_to_metadata {
$event:ident $( ( $( $param:path ),* ) )*,
$( $rest:tt )*
) => {
__events_to_metadata!(
$crate::__events_to_metadata!(
$( $metadata, )*
$crate::event::EventMetadata {
name: $crate::event::DecodeDifferent::Encode(stringify!($event)),