From d55638b3acb8789244f3fa5da68c525c655e86bb Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Tue, 10 Sep 2019 04:09:17 +0200
Subject: [PATCH] Use edition 2018.

---
 Cargo.toml         |  1 +
 src/cargo.rs       |  4 ++--
 src/cli.rs         |  6 +++---
 src/docker.rs      | 10 +++++-----
 src/extensions.rs  |  2 +-
 src/file.rs        |  2 +-
 src/interpreter.rs |  6 +++---
 src/main.rs        |  8 ++++----
 src/rustc.rs       |  6 +++---
 src/rustup.rs      |  6 +++---
 10 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9fd22ed39..e8fe2ca99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ license = "MIT OR Apache-2.0"
 name = "cross"
 repository = "https://github.com/rust-embedded/cross"
 version = "0.1.16"
+edition = "2018"
 
 [dependencies]
 atty = "0.2"
diff --git a/src/cargo.rs b/src/cargo.rs
index 4a04d731e..01ce9fdf3 100644
--- a/src/cargo.rs
+++ b/src/cargo.rs
@@ -2,8 +2,8 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, ExitStatus};
 use std::{env, fs};
 
-use errors::*;
-use extensions::CommandExt;
+use crate::errors::*;
+use crate::extensions::CommandExt;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Subcommand {
diff --git a/src/cli.rs b/src/cli.rs
index 6894aaba8..2401566f7 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,8 +1,8 @@
 use std::env;
 
-use Target;
-use cargo::Subcommand;
-use rustc::TargetList;
+use crate::Target;
+use crate::cargo::Subcommand;
+use crate::rustc::TargetList;
 
 pub struct Args {
     pub all: Vec<String>,
diff --git a/src/docker.rs b/src/docker.rs
index 4ac273351..4e78ed32e 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -5,11 +5,11 @@ use std::{env, fs};
 use atty::Stream;
 use semver::{Version, VersionReq};
 
-use {Target, Toml};
-use cargo::Root;
-use errors::*;
-use extensions::CommandExt;
-use id;
+use crate::{Target, Toml};
+use crate::cargo::Root;
+use crate::errors::*;
+use crate::extensions::CommandExt;
+use crate::id;
 
 const DOCKER_IMAGES: &[&str] = &include!(concat!(env!("OUT_DIR"), "/docker-images.rs"));
 
diff --git a/src/extensions.rs b/src/extensions.rs
index 27ced011a..c2800ba0e 100644
--- a/src/extensions.rs
+++ b/src/extensions.rs
@@ -1,6 +1,6 @@
 use std::process::{Command, ExitStatus};
 
-use errors::*;
+use crate::errors::*;
 
 pub trait CommandExt {
     fn run(&mut self, verbose: bool) -> Result<()>;
diff --git a/src/file.rs b/src/file.rs
index 40427768c..636ceed3e 100644
--- a/src/file.rs
+++ b/src/file.rs
@@ -2,7 +2,7 @@ use std::fs::File;
 use std::io::Read;
 use std::path::Path;
 
-use errors::*;
+use crate::errors::*;
 
 pub fn read<P>(path: P) -> Result<String>
     where P: AsRef<Path>
diff --git a/src/interpreter.rs b/src/interpreter.rs
index f7d828742..39adb468f 100644
--- a/src/interpreter.rs
+++ b/src/interpreter.rs
@@ -1,8 +1,8 @@
 use std::path::Path;
 
-use errors::*;
-use file;
-use Target;
+use crate::errors::*;
+use crate::file;
+use crate::Target;
 
 /// Checks if the interpreters have been registered in the host system
 pub fn is_registered(target: &Target) -> Result<bool> {
diff --git a/src/main.rs b/src/main.rs
index 7f62ccac6..add83367b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,12 +33,12 @@ use std::{env, io, process};
 
 use toml::{Value, value::Table};
 
-use cargo::{Root, Subcommand};
-use errors::*;
-use rustc::{TargetList, VersionMetaExt};
+use self::cargo::{Root, Subcommand};
+use self::errors::*;
+use self::rustc::{TargetList, VersionMetaExt};
 
 #[allow(non_camel_case_types)]
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Host {
     Other,
 
diff --git a/src/rustc.rs b/src/rustc.rs
index d36e74e2c..cdaddf44b 100644
--- a/src/rustc.rs
+++ b/src/rustc.rs
@@ -3,9 +3,9 @@ use std::process::Command;
 
 use rustc_version::{Version, VersionMeta};
 
-use {Host, Target};
-use errors::*;
-use extensions::CommandExt;
+use crate::{Host, Target};
+use crate::errors::*;
+use crate::extensions::CommandExt;
 
 pub struct TargetList {
     triples: Vec<String>,
diff --git a/src/rustup.rs b/src/rustup.rs
index 6fbf646eb..9aa982a6c 100644
--- a/src/rustup.rs
+++ b/src/rustup.rs
@@ -1,8 +1,8 @@
 use std::process::Command;
 
-use Target;
-use errors::*;
-use extensions::CommandExt;
+use crate::Target;
+use crate::errors::*;
+use crate::extensions::CommandExt;
 
 #[derive(Debug)]
 pub struct AvailableTargets {