Merge pull request #44 from tox-rs/edition_2018

Edition 2018

Author: kpp

Cargo.lock

@@ -13,6 +13,7 @@ repository = "https://github.com/tox-rs/tox-node/"
 keywords = ["p2p", "instant-messaging", "tox", "toxcore", "networking"]
 categories = ["multimedia"]
 license = "MIT"
+edition = "2018"
 
 [dependencies]
 chrono = "0.4"
@@ -27,8 +28,7 @@ regex = "1"
 tokio = "0.1.7"
 tokio-codec = "0.1"
 config = "0.9"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.8.8"
 tox = { git = "https://github.com/tox-rs/tox.git" }
 

Cargo.toml

@@ -1,24 +1,7 @@
-extern crate chrono;
 #[macro_use]
 extern crate clap;
-extern crate env_logger;
-extern crate failure;
-extern crate futures;
-extern crate hex;
-extern crate itertools;
 #[macro_use]
 extern crate log;
-extern crate regex;
-#[cfg(unix)]
-extern crate syslog;
-extern crate tokio;
-extern crate tokio_codec;
-extern crate config;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde;
-extern crate serde_yaml;
-extern crate tox;
 
 mod node_config;
 mod motd;
@@ -48,8 +31,8 @@ use tox::toxcore::stats::Stats;
 #[cfg(unix)]
 use syslog::Facility;
 
-use node_config::*;
-use motd::{Motd, Counters};
+use crate::node_config::*;
+use crate::motd::{Motd, Counters};
 
 /// Channel size for onion messages between UDP and TCP relay.
 const ONION_CHANNEL_SIZE: usize = 32;

src/main.rs

@@ -5,7 +5,7 @@ use std::path::Path;
 use std::collections::HashMap;
 
 use config::{Config, File as CfgFile};
-use serde::de::{self, Deserialize, Deserializer};
+use serde::{de, Deserialize, Deserializer};
 use serde_yaml::Value;
 use clap::{App, AppSettings, Arg, SubCommand, ArgMatches};
 use hex::FromHex;