From 7b0f82b4f00d47ca50d8bfe814968fcfb9c1734b Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 8 Feb 2019 14:31:05 +0100
Subject: [PATCH] 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
---
substrate/node-template/runtime/Cargo.toml | 4 ++--
substrate/node-template/runtime/src/lib.rs | 2 +-
substrate/srml/support/src/dispatch.rs | 2 +-
substrate/srml/support/src/event.rs | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/substrate/node-template/runtime/Cargo.toml b/substrate/node-template/runtime/Cargo.toml
index 7e7c76e1ba6..24f9b513f09 100644
--- a/substrate/node-template/runtime/Cargo.toml
+++ b/substrate/node-template/runtime/Cargo.toml
@@ -13,7 +13,7 @@ parity-codec-derive = { version = "3.0", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default_features = false }
runtime-io = { package = "sr-io", path = "../../core/sr-io", default_features = false }
version = { package = "sr-version", path = "../../core/sr-version", default_features = false }
-support = { package = "srml-support", path = "../../srml/support", default_features = false }
+srml-support = { path = "../../srml/support", default_features = false }
primitives = { package = "substrate-primitives", path = "../../core/primitives", default_features = false }
balances = { package = "srml-balances", path = "../../srml/balances", default_features = false }
consensus = { package = "srml-consensus", path = "../../srml/consensus", default_features = false }
@@ -36,7 +36,7 @@ std = [
"substrate-client/std",
"rstd/std",
"runtime-io/std",
- "support/std",
+ "srml-support/std",
"balances/std",
"executive/std",
"aura/std",
diff --git a/substrate/node-template/runtime/src/lib.rs b/substrate/node-template/runtime/src/lib.rs
index e99b1603606..2cdf37fdbc0 100644
--- a/substrate/node-template/runtime/src/lib.rs
+++ b/substrate/node-template/runtime/src/lib.rs
@@ -38,7 +38,7 @@ pub use timestamp::Call as TimestampCall;
pub use balances::Call as BalancesCall;
pub use runtime_primitives::{Permill, Perbill};
pub use timestamp::BlockPeriod;
-pub use support::{StorageValue, construct_runtime};
+pub use srml_support::{StorageValue, construct_runtime};
/// Alias to Ed25519 pubkey that identifies an account on the chain.
pub type AccountId = primitives::H256;
diff --git a/substrate/srml/support/src/dispatch.rs b/substrate/srml/support/src/dispatch.rs
index 044bd48b7e1..8e5cc44092b 100644
--- a/substrate/srml/support/src/dispatch.rs
+++ b/substrate/srml/support/src/dispatch.rs
@@ -732,7 +732,7 @@ macro_rules! decl_module {
d.dispatch(origin)
}
}
- __dispatch_impl_metadata! {
+ $crate::__dispatch_impl_metadata! {
$mod_type $trait_instance $trait_name $call_type $origin_type
{$( $(#[doc = $doc_attr])* fn $fn_name($from $(, $(#[$codec_attr])* $param_name : $param )*); )*}
}
diff --git a/substrate/srml/support/src/event.rs b/substrate/srml/support/src/event.rs
index 3be7572fe07..c97bbbb8bf9 100644
--- a/substrate/srml/support/src/event.rs
+++ b/substrate/srml/support/src/event.rs
@@ -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)),
--
GitLab