From 8247ad561335bc20d025b1344ddfc224a3171996 Mon Sep 17 00:00:00 2001
From: Stanislav Tkach <stanislav.tkach@gmail.com>
Date: Tue, 29 Jan 2019 13:47:40 +0200
Subject: [PATCH] Migrate subkey and chain-spec-builder to the 2018 edition
(#1605)
---
substrate/subkey/Cargo.toml | 1 +
substrate/subkey/src/main.rs | 6 +-----
substrate/test-utils/chain-spec-builder/Cargo.toml | 1 +
substrate/test-utils/chain-spec-builder/src/main.rs | 9 +--------
4 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/substrate/subkey/Cargo.toml b/substrate/subkey/Cargo.toml
index 2ec76a71980..868ab3f7447 100644
--- a/substrate/subkey/Cargo.toml
+++ b/substrate/subkey/Cargo.toml
@@ -2,6 +2,7 @@
name = "subkey"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
[dependencies]
substrate-primitives = { version = "*", path = "../core/primitives" }
diff --git a/substrate/subkey/src/main.rs b/substrate/subkey/src/main.rs
index facc72c1553..48fb7ad1227 100644
--- a/substrate/subkey/src/main.rs
+++ b/substrate/subkey/src/main.rs
@@ -17,12 +17,8 @@
#![cfg_attr(feature = "bench", feature(test))]
#[cfg(feature = "bench")]
extern crate test;
-extern crate substrate_primitives;
-extern crate rand;
-
-#[macro_use]
-extern crate clap;
+use clap::load_yaml;
use rand::{RngCore, rngs::OsRng};
use substrate_primitives::{ed25519::Pair, hexdisplay::HexDisplay};
diff --git a/substrate/test-utils/chain-spec-builder/Cargo.toml b/substrate/test-utils/chain-spec-builder/Cargo.toml
index 7bd99e53aac..79290463da0 100644
--- a/substrate/test-utils/chain-spec-builder/Cargo.toml
+++ b/substrate/test-utils/chain-spec-builder/Cargo.toml
@@ -2,6 +2,7 @@
name = "chain-spec-builder"
version = "0.1.0"
authors = ["haydn dufrene <haydn.dufrene@gmail.com>"]
+edition = "2018"
[dependencies]
clap = { version = "~2.32", features = ["yaml"] }
diff --git a/substrate/test-utils/chain-spec-builder/src/main.rs b/substrate/test-utils/chain-spec-builder/src/main.rs
index f0e9ef066ff..b899f9c1fca 100644
--- a/substrate/test-utils/chain-spec-builder/src/main.rs
+++ b/substrate/test-utils/chain-spec-builder/src/main.rs
@@ -1,11 +1,4 @@
-#[macro_use]
-extern crate clap;
-
-use clap::App;
-
-extern crate node_cli;
-extern crate substrate_service;
-extern crate substrate_primitives;
+use clap::{App, load_yaml};
use node_cli::chain_spec;
use substrate_service::chain_ops::build_spec;
--
GitLab