Migrate network, primitives and rpc to the 2018 edition (#1710)

substrate/core/rpc/src/system/error.rs

@@ -16,10 +16,11 @@
 
 //! System RPC module errors.
 
-use rpc;
+use error_chain::*;
 
-use errors;
-use system::helpers::Health;
+use crate::rpc;
+use crate::errors;
+use crate::system::helpers::Health;
 
 error_chain! {
 	errors {

substrate/core/rpc/src/system/tests.rs

@@ -19,6 +19,7 @@ use super::*;
 use network::{self, SyncState, SyncStatus, ProtocolStatus, NodeIndex, PeerId, PeerInfo as NetworkPeerInfo, PublicKey};
 use network::config::Roles;
 use test_client::runtime::Block;
+use assert_matches::assert_matches;
 
 #[derive(Default)]
 struct Status {