Rust 2018: run cargo fix --edition-idioms

Cargo.toml

@@ -2,6 +2,7 @@
 authors = ["Corentin Henry <corentinhenry@gmail.com>"]
 name = "xi-term"
 version = "0.1.0"
+edition = "2018"
 
 [dependencies]
 clap = "2.33.0"
@@ -16,4 +17,4 @@ indexmap = "1.0.2"
 xrl = "0.0.7"
 serde = { version = "1.0.93", features = ["derive"] }
 serde_json = "1.0.39"
-json5 = "0.2.4"
+json5 = "0.2.4"

src/core/config.rs

@@ -28,7 +28,7 @@ pub struct KeybindingConfig {
 }
 
 impl KeybindingConfig {
-    pub fn parse(config_path: &Path) -> Result<KeybindingConfig, Box<std::error::Error + Sync + Send + 'static>> {
+    pub fn parse(config_path: &Path) -> Result<KeybindingConfig, Box<dyn std::error::Error + Sync + Send + 'static>> {
         let entries = fs::read_to_string(config_path)?;
         // Read the JSON contents of the file as an instance of `User`.
         let bindings: Vec<Keybinding> = json5::from_str(&entries)?;

src/main.rs

@@ -5,22 +5,12 @@
 #[macro_use]
 extern crate clap;
 
-extern crate failure;
-
 #[macro_use]
 extern crate log;
-extern crate log4rs;
-
-extern crate futures;
-extern crate indexmap;
-extern crate termion;
-extern crate tokio;
-extern crate xdg;
-extern crate xrl;
-
-extern crate json5;
-extern crate serde;
-extern crate serde_json;
+
+use log4rs;
+use tokio;
+use xrl;
 
 mod core;
 mod widgets;