Merge pull request #1583 from kinnison/kinnison/edition-2018

Run basic 2018 edition fix

Author: nrc

Cargo.toml

@@ -2,6 +2,7 @@
 
 name = "rustup"
 version = "1.16.0"
+edition = "2018"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Manage multiple rust installations with ease"
 

src/download/Cargo.toml

@@ -2,6 +2,7 @@
 
 name = "download"
 version = "0.4.0"
+edition = "2018"
 authors = [ "Brian Anderson <banderson@mozilla.com>" ]
 
 license = "MIT/Apache-2.0"

src/download/src/lib.rs

@@ -14,7 +14,7 @@ use url::Url;
 use std::path::Path;
 
 mod errors;
-pub use errors::*;
+pub use crate::errors::*;
 
 #[derive(Debug, Copy, Clone)]
 pub enum Backend {
@@ -136,7 +136,7 @@ pub mod curl {
     extern crate curl;
 
     use self::curl::easy::Easy;
-    use errors::*;
+    use crate::errors::*;
     use std::cell::RefCell;
     use std::str;
     use std::time::Duration;
@@ -256,7 +256,7 @@ pub mod reqwest_be {
 
     use std::io;
     use std::time::Duration;
-    use errors::*;
+    use crate::errors::*;
     use url::Url;
     use super::Event;
     use reqwest::{header, Client, Proxy, Response};

src/download/tests/download-curl-resume.rs

@@ -10,7 +10,7 @@ use url::Url;
 use download::*;
 
 mod support;
-use support::{file_contents, serve_file, tmp_dir, write_file};
+use crate::support::{file_contents, serve_file, tmp_dir, write_file};
 
 #[test]
 fn partially_downloaded_file_gets_resumed_from_byte_offset() {

src/download/tests/download-reqwest-resume.rs

@@ -10,7 +10,7 @@ use url::Url;
 use download::*;
 
 mod support;
-use support::{file_contents, serve_file, tmp_dir, write_file};
+use crate::support::{file_contents, serve_file, tmp_dir, write_file};
 
 #[test]
 fn resume_partial_from_file_url() {

src/rustup-cli/common.rs

@@ -2,18 +2,18 @@
 
 use rustup::{self, Cfg, Notification, Toolchain, UpdateStatus};
 use rustup::telemetry_analysis::TelemetryAnalysis;
-use errors::*;
+use crate::errors::*;
 use rustup_utils::utils;
 use rustup_utils::notify::NotificationLevel;
-use self_update;
+use crate::self_update;
 use std::io::{BufRead, BufReader, Write};
 use std::process::{Command, Stdio};
 use std::path::Path;
 use std::{cmp, iter};
 use std::sync::Arc;
 use std::time::Duration;
 use std;
-use term2;
+use crate::term2;
 use wait_timeout::ChildExt;
 
 pub fn confirm(question: &str, default: bool) -> Result<bool> {
@@ -104,7 +104,7 @@ pub fn read_line() -> Result<String> {
 }
 
 pub fn set_globals(verbose: bool) -> Result<Cfg> {
-    use download_tracker::DownloadTracker;
+    use crate::download_tracker::DownloadTracker;
     use std::cell::RefCell;
 
     let download_tracker = RefCell::new(DownloadTracker::new());

src/rustup-cli/log.rs

@@ -1,4 +1,4 @@
-use term2;
+use crate::term2;
 use std::fmt;
 use std::io::Write;
 

src/rustup-cli/main.rs

@@ -58,7 +58,7 @@ mod help;
 use std::alloc::System;
 use std::env;
 use std::path::PathBuf;
-use errors::*;
+use crate::errors::*;
 use rustup_dist::dist::TargetTriple;
 use rustup::env_var::RUST_RECURSION_COUNT_MAX;
 

src/rustup-cli/proxy_mode.rs

@@ -1,16 +1,16 @@
-use common::set_globals;
+use crate::common::set_globals;
 use rustup::Cfg;
-use errors::*;
+use crate::errors::*;
 use rustup_utils::utils::{self, ExitCode};
 use rustup::command::run_command_for_dir;
 use std::env;
 use std::ffi::OsString;
 use std::path::PathBuf;
 use std::process;
-use job;
+use crate::job;
 
 pub fn main() -> Result<()> {
-    ::self_update::cleanup_self_updater()?;
+    crate::self_update::cleanup_self_updater()?;
 
     let ExitCode(c) = {
         let _setup = job::setup();

src/rustup-cli/rustup_mode.rs

@@ -1,22 +1,22 @@
 use clap::{App, AppSettings, Arg, ArgGroup, ArgMatches, Shell, SubCommand};
-use common;
+use crate::common;
 use rustup::{command, Cfg, Toolchain};
 use rustup::settings::TelemetryMode;
-use errors::*;
+use crate::errors::*;
 use rustup_dist::manifest::Component;
 use rustup_dist::dist::{PartialTargetTriple, PartialToolchainDesc, TargetTriple};
 use rustup_utils::utils::{self, ExitCode};
-use self_update;
+use crate::self_update;
 use std::path::Path;
 use std::process::{self, Command};
 use std::iter;
 use std::error::Error;
-use term2;
+use crate::term2;
 use std::io::{self, Write};
-use help::*;
+use crate::help::*;
 
 pub fn main() -> Result<()> {
-    ::self_update::cleanup_self_updater()?;
+    crate::self_update::cleanup_self_updater()?;
 
     let ref matches = cli().get_matches();
     let verbose = matches.is_present("verbose");