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

Run basic 2018 edition fix

Cargo.toml

@@ -2,6 +2,7 @@
 
 name = "rustup"
 version = "1.16.0"
+edition = "2018"
 authors = [ "Diggory Blake <[email protected]>" ]
 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 <[email protected]>" ]
 
 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");

src/rustup-cli/self_update.rs

@@ -30,8 +30,8 @@
 //! Deleting the running binary during uninstall is tricky
 //! and racy on Windows.
 
-use common::{self, Confirm};
-use errors::*;
+use crate::common::{self, Confirm};
+use crate::errors::*;
 use rustup_dist::dist;
 use rustup_utils::utils;
 use rustup::{TOOLS, DUP_TOOLS};
@@ -42,7 +42,7 @@ use std::path::{Component, Path, PathBuf};
 use std::process::{self, Command};
 use std::fs;
 use tempdir::TempDir;
-use term2;
+use crate::term2;
 use regex::Regex;
 
 pub struct InstallOpts {

src/rustup-cli/setup_mode.rs

@@ -1,9 +1,9 @@
 use std::env;
-use self_update::{self, InstallOpts};
-use errors::*;
+use crate::self_update::{self, InstallOpts};
+use crate::errors::*;
 use clap::{App, AppSettings, Arg};
 use rustup_dist::dist::TargetTriple;
-use common;
+use crate::common;
 
 pub fn main() -> Result<()> {
     let args: Vec<_> = env::args().collect();

src/rustup-dist/Cargo.toml

@@ -2,6 +2,7 @@
 
 name = "rustup-dist"
 version = "1.16.0"
+edition = "2018"
 authors = [ "Diggory Blake <[email protected]>" ]
 description = "Installation from a Rust distribution server"
 build = "build.rs"

src/rustup-dist/src/component/components.rs

@@ -3,11 +3,11 @@
 /// installation / uninstallation process.
 
 use rustup_utils::utils;
-use prefix::InstallPrefix;
-use errors::*;
+use crate::prefix::InstallPrefix;
+use crate::errors::*;
 
-use component::transaction::Transaction;
-use component::package::{INSTALLER_VERSION, VERSION_FILE};
+use crate::component::transaction::Transaction;
+use crate::component::package::{INSTALLER_VERSION, VERSION_FILE};
 
 use std::path::{Path, PathBuf};
 use std::fs::File;

src/rustup-dist/src/component/package.rs

@@ -6,12 +6,12 @@ extern crate flate2;
 extern crate tar;
 extern crate xz2;
 
-use component::components::*;
-use component::transaction::*;
+use crate::component::components::*;
+use crate::component::transaction::*;
 
-use errors::*;
+use crate::errors::*;
 use rustup_utils::utils;
-use temp;
+use crate::temp;
 
 use std::path::{Path, PathBuf};
 use std::collections::HashSet;

src/rustup-dist/src/component/transaction.rs

@@ -10,10 +10,10 @@
 //! does not remove any dirs created by it.
 
 use rustup_utils::utils;
-use temp;
-use prefix::InstallPrefix;
-use errors::*;
-use notifications::*;
+use crate::temp;
+use crate::prefix::InstallPrefix;
+use crate::errors::*;
+use crate::notifications::*;
 
 use std::fs::File;
 use std::path::{Path, PathBuf};

src/rustup-dist/src/config.rs

@@ -1,7 +1,7 @@
 use toml;
 
 use rustup_utils::toml_utils::*;
-use errors::*;
+use crate::errors::*;
 use super::manifest::Component;
 
 pub const SUPPORTED_CONFIG_VERSIONS: [&'static str; 1] = ["1"];

src/rustup-dist/src/dist.rs

@@ -1,12 +1,12 @@
-use temp;
-use errors::*;
-use notifications::*;
+use crate::temp;
+use crate::errors::*;
+use crate::notifications::*;
 use rustup_utils::{self, utils};
-use prefix::InstallPrefix;
-use manifest::Component;
-use manifest::Manifest as ManifestV2;
-use manifestation::{Changes, Manifestation, UpdateStatus};
-use download::DownloadCfg;
+use crate::prefix::InstallPrefix;
+use crate::manifest::Component;
+use crate::manifest::Manifest as ManifestV2;
+use crate::manifestation::{Changes, Manifestation, UpdateStatus};
+use crate::download::DownloadCfg;
 
 use std::path::Path;
 use std::fmt;

src/rustup-dist/src/download.rs

@@ -1,7 +1,7 @@
 use rustup_utils::utils;
-use errors::*;
-use temp;
-use notifications::*;
+use crate::errors::*;
+use crate::temp;
+use crate::notifications::*;
 use sha2::{Digest, Sha256};
 use url::Url;
 

src/rustup-dist/src/errors.rs

@@ -1,9 +1,9 @@
 use std::path::PathBuf;
 use std::io::{self, Write};
-use temp;
+use crate::temp;
 use toml;
 use rustup_utils;
-use manifest::{Component, Manifest};
+use crate::manifest::{Component, Manifest};
 
 error_chain! {
     links {

src/rustup-dist/src/lib.rs

@@ -19,8 +19,8 @@ extern crate winapi;
 #[cfg(windows)]
 extern crate winreg;
 
-pub use errors::*;
-pub use notifications::Notification;
+pub use crate::errors::*;
+pub use crate::notifications::Notification;
 
 pub mod temp;
 

src/rustup-dist/src/manifest.rs

@@ -10,12 +10,12 @@
 //!
 //! See tests/channel-rust-nightly-example.toml for an example.
 
-use errors::*;
+use crate::errors::*;
 use toml;
 use rustup_utils::toml_utils::*;
 
 use std::collections::HashMap;
-use dist::TargetTriple;
+use crate::dist::TargetTriple;
 
 pub const SUPPORTED_MANIFEST_VERSIONS: [&'static str; 1] = ["2"];
 pub const DEFAULT_MANIFEST_VERSION: &'static str = "2";

src/rustup-dist/src/manifestation.rs

@@ -1,16 +1,16 @@
 //! Maintains a Rust installation by installing individual Rust
 //! platform components from a distribution server.
 
-use config::Config;
-use manifest::{Component, Manifest, TargetedPackage};
-use dist::{TargetTriple, DEFAULT_DIST_SERVER};
-use component::{Components, Package, TarGzPackage, TarXzPackage, Transaction};
-use temp;
-use errors::*;
-use notifications::*;
+use crate::config::Config;
+use crate::manifest::{Component, Manifest, TargetedPackage};
+use crate::dist::{TargetTriple, DEFAULT_DIST_SERVER};
+use crate::component::{Components, Package, TarGzPackage, TarXzPackage, Transaction};
+use crate::temp;
+use crate::errors::*;
+use crate::notifications::*;
 use rustup_utils::utils;
-use download::{DownloadCfg, File};
-use prefix::InstallPrefix;
+use crate::download::{DownloadCfg, File};
+use crate::prefix::InstallPrefix;
 use std::path::Path;
 
 pub const DIST_MANIFEST: &'static str = "multirust-channel-manifest.toml";
@@ -600,7 +600,7 @@ impl Update {
         let mut unavailable_components: Vec<Component> = self.components_to_install
             .iter()
             .filter(|c| {
-                use manifest::*;
+                use crate::manifest::*;
                 let pkg: Option<&Package> = new_manifest.get_package(&c.short_name_in_manifest()).ok();
                 let target_pkg: Option<&TargetedPackage> =
                     pkg.and_then(|p| p.get_target(c.target.as_ref()).ok());

src/rustup-dist/src/notifications.rs

@@ -1,10 +1,10 @@
 use std::path::Path;
 use std::fmt::{self, Display};
-use temp;
+use crate::temp;
 use rustup_utils;
 use rustup_utils::notify::NotificationLevel;
-use dist::TargetTriple;
-use errors::*;
+use crate::dist::TargetTriple;
+use crate::errors::*;
 
 #[derive(Debug)]
 pub enum Notification<'a> {

src/rustup-mock/Cargo.toml

@@ -2,6 +2,7 @@
 
 name = "rustup-mock"
 version = "1.16.0"
+edition = "2018"
 authors = [ "Diggory Blake <[email protected]>" ]
 description = "Test mocks for rustup"
 

src/rustup-mock/src/clitools.rs

@@ -13,8 +13,8 @@ use std::process::{Command, Stdio};
 use std::sync::Arc;
 use std::time::Duration;
 use tempdir::TempDir;
-use {MockComponentBuilder, MockFile, MockInstallerBuilder};
-use dist::{change_channel_date, ManifestVersion, MockChannel, MockComponent, MockDistServer,
+use crate::{MockComponentBuilder, MockFile, MockInstallerBuilder};
+use crate::dist::{change_channel_date, ManifestVersion, MockChannel, MockComponent, MockDistServer,
            MockPackage, MockTargetedPackage};
 use url::Url;
 use wait_timeout::ChildExt;