Use rust 2018 edition

client/Cargo.toml

@@ -2,6 +2,7 @@
 name = "codechain-dashboard-client"
 version = "0.1.0"
 authors = ["CodeChain Team <codechain@kodebox.io>"]
+edition = "2018"
 
 [dependencies]
 atty = "0.2"

client/src/rpc/api.rs

@@ -11,8 +11,7 @@ use super::types::{
     response, ClientGetInfoResponse, CodeChainCallRPCResponse, RPCResult, ShellGetCodeChainLogRequest,
     ShellStartCodeChainRequest, UpdateCodeChainRequest,
 };
-use rpc::types::RPCError;
-use rpc::types::ERR_NETWORK_ERROR;
+use super::types::{RPCError, ERR_NETWORK_ERROR};
 
 pub fn add_routing(router: &mut Router) {
     router.add_route("ping", Box::new(ping as fn(&HandlerContext) -> RPCResult<String>));

server/Cargo.toml

@@ -2,6 +2,7 @@
 name = "codechain-dashboard-server"
 version = "0.1.0"
 authors = ["CodeChain Team <codechain@kodebox.io>"]
+edition = "2018"
 
 [dependencies]
 atty = "0.2"

server/src/cron/remove_network_usage.rs

@@ -1,12 +1,11 @@
-use std::format;
-use std::thread;
+use std::{format, thread};
 
 use chrono;
-use db::queries::network_usage::remove_older_logs;
-use postgres;
-use postgres::TlsMode;
+use postgres::{self, TlsMode};
 use time;
 
+use crate::db::queries::network_usage::remove_older_logs;
+
 pub fn run(db_user: &str, db_password: &str) {
     let conn_uri = format!("postgres://{}:{}@localhost", db_user, db_password);
     let conn = postgres::Connection::connect(conn_uri, TlsMode::None).unwrap();

server/src/db/queries/network_usage.rs

@@ -3,8 +3,8 @@ use postgres;
 use regex::{Captures, Regex};
 
 use super::super::types::DBConnection;
-use common_rpc_types::NetworkUsage;
-use util::{floor_to_5min, start_of_day, start_of_hour};
+use crate::common_rpc_types::NetworkUsage;
+use crate::util::{floor_to_5min, start_of_day, start_of_hour};
 
 pub fn insert(
     conn: &DBConnection,

server/src/db/queries/network_usage_graph.rs

@@ -1,10 +1,10 @@
-use common_rpc_types::{
-    GraphCommonArgs, GraphNetworkOutAllRow, GraphNetworkOutNodeExtensionRow, GraphNetworkOutNodePeerRow, GraphPeriod,
-    NodeName,
-};
 use postgres;
 
 use super::super::types::DBConnection;
+use crate::common_rpc_types::{
+    GraphCommonArgs, GraphNetworkOutAllRow, GraphNetworkOutNodeExtensionRow, GraphNetworkOutNodePeerRow, GraphPeriod,
+    NodeName,
+};
 
 pub fn query_network_out_all(
     conn: &DBConnection,

server/src/db/service.rs

@@ -8,16 +8,16 @@ use std::thread;
 use r2d2_postgres::PostgresConnectionManager;
 
 use super::super::common_rpc_types as rpc_type;
-use super::super::common_rpc_types::{NodeName, NodeStatus, StructuredLog};
+use super::super::common_rpc_types::{
+    GraphCommonArgs, GraphNetworkOutAllAVGRow, GraphNetworkOutAllRow, GraphNetworkOutNodeExtensionRow,
+    GraphNetworkOutNodePeerRow, NetworkUsage, NodeName, NodeStatus, StructuredLog,
+};
+use super::super::util;
 use super::event::{Event, EventSubscriber};
 use super::queries;
-use super::types::{ClientExtra, ClientQueryResult, Connection, Connections, Error as DBError, Log, LogQueryParams};
-use common_rpc_types::{
-    GraphCommonArgs, GraphNetworkOutAllAVGRow, GraphNetworkOutAllRow, GraphNetworkOutNodeExtensionRow,
-    GraphNetworkOutNodePeerRow, NetworkUsage,
+use super::types::{
+    ClientExtra, ClientQueryResult, Connection, Connections, DBConnection, Error as DBError, Log, LogQueryParams,
 };
-use db::types::DBConnection;
-use util;
 
 #[derive(Debug, Clone)]
 pub enum Message {

server/src/frontend/api.rs

@@ -1,13 +1,12 @@
 use super::super::client::SendClientRPC;
-use super::super::common_rpc_types::{NodeName, ShellStartCodeChainRequest};
+use super::super::common_rpc_types::{GraphCommonArgs, NodeName, ShellStartCodeChainRequest, UpdateCodeChainRequest};
 use super::super::router::Router;
 use super::super::rpc::{response, RPCError, RPCResponse};
 use super::types::{
     Context, DashboardGetNetworkResponse, DashboardNode, GraphNetworkOutAllAVGResponse, GraphNetworkOutAllResponse,
     GraphNetworkOutNodeExtensionResponse, GraphNetworkOutNodePeerResponse, LogGetRequest, LogGetResponse,
     LogGetTargetsResponse, NodeConnection, NodeGetInfoResponse,
 };
-use common_rpc_types::{GraphCommonArgs, UpdateCodeChainRequest};
 
 pub fn add_routing(router: &mut Router<Context>) {
     router.add_route("ping", Box::new(ping as fn(Context) -> RPCResponse<String>));