diff --git a/Cargo.lock b/Cargo.lock index 38ae1520e7..88ef6a30e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,5 @@ [root] -name = "multirust-rs" +name = "rustup" version = "0.1.6" dependencies = [ "clap 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -8,12 +8,12 @@ dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "multirust-dist 0.1.6", - "multirust-mock 0.1.6", - "multirust-utils 0.1.6", "openssl 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rustup-dist 0.1.6", + "rustup-mock 0.1.6", + "rustup-utils 0.1.6", "scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -238,57 +238,6 @@ dependencies = [ "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "multirust-dist" -version = "0.1.6" -dependencies = [ - "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "multirust-mock 0.1.6", - "multirust-utils 0.1.6", - "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "multirust-mock" -version = "0.1.6" -dependencies = [ - "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "multirust-utils" -version = "0.1.6" -dependencies = [ - "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "userenv-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winreg 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "num" version = "0.1.32" @@ -424,6 +373,57 @@ dependencies = [ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rustup-dist" +version = "0.1.6" +dependencies = [ + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rustup-mock 0.1.6", + "rustup-utils 0.1.6", + "tar 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rustup-mock" +version = "0.1.6" +dependencies = [ + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tar 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rustup-utils" +version = "0.1.6" +dependencies = [ + "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "userenv-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winreg 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "scopeguard" version = "0.1.2" diff --git a/Cargo.toml b/Cargo.toml index 0dd7d17941..4f188af674 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "multirust-rs" +name = "rustup" version = "0.1.6" authors = [ "Diggory Blake " ] description = "multirust in rust - manage multiple rust installations with ease" @@ -16,8 +16,8 @@ keywords = ["multirust", "install", "proxy"] license = "MIT OR Apache-2.0" [dependencies] -multirust-dist = { path = "src/multirust-dist" } -multirust-utils = { path = "src/multirust-utils" } +rustup-dist = { path = "src/rustup-dist" } +rustup-utils = { path = "src/rustup-utils" } clap = "2.2.4" regex = "0.1.41" openssl = "0.7.2" @@ -55,15 +55,15 @@ user32-sys = "0.1.2" kernel32-sys = "0.2.1" [dev-dependencies] -multirust-mock = { path = "src/multirust-mock" } +rustup-mock = { path = "src/rustup-mock" } lazy_static = "0.1.15" [lib] -name = "multirust" -path = "src/multirust/lib.rs" +name = "rustup" +path = "src/rustup/lib.rs" test = false # no unit tests [[bin]] name = "rustup-setup" -path = "src/multirust-cli/main.rs" +path = "src/rustup-cli/main.rs" test = false # no unit tests diff --git a/appveyor.yml b/appveyor.yml index 1eb3fc97f7..c99d7d6763 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ build: false test_script: - cargo build --release - - cargo test --release -p multirust-dist + - cargo test --release -p rustup-dist - cargo test --release notifications: diff --git a/ci/run.sh b/ci/run.sh index e164abb229..7f10ff39b7 100644 --- a/ci/run.sh +++ b/ci/run.sh @@ -5,6 +5,6 @@ set -ex cargo build --release --target $TARGET if [ -z "$SKIP_TESTS" ]; then - cargo test --release -p multirust-dist --target $TARGET + cargo test --release -p rustup-dist --target $TARGET cargo test --release --target $TARGET fi diff --git a/src/multirust-cli/cli.rs b/src/rustup-cli/cli.rs similarity index 100% rename from src/multirust-cli/cli.rs rename to src/rustup-cli/cli.rs diff --git a/src/multirust-cli/common.rs b/src/rustup-cli/common.rs similarity index 96% rename from src/multirust-cli/common.rs rename to src/rustup-cli/common.rs index 787f01cae2..179a343218 100644 --- a/src/multirust-cli/common.rs +++ b/src/rustup-cli/common.rs @@ -1,8 +1,8 @@ //! Just a dumping ground for cli stuff -use multirust::{Cfg, Result, Notification, Toolchain, Error, UpdateStatus}; -use multirust_utils::{self, utils}; -use multirust_utils::notify::NotificationLevel; +use rustup::{Cfg, Result, Notification, Toolchain, Error, UpdateStatus}; +use rustup_utils::{self, utils}; +use rustup_utils::notify::NotificationLevel; use self_update; use std::ffi::OsStr; use std::io::{Write, Read, BufRead}; @@ -83,9 +83,9 @@ pub fn run_inner>(mut command: Command, process::exit(code); } Err(e) => { - Err(multirust_utils::Error::RunningCommand { + Err(rustup_utils::Error::RunningCommand { name: args[0].as_ref().to_owned(), - error: multirust_utils::raw::CommandError::Io(e), + error: rustup_utils::raw::CommandError::Io(e), }.into()) } } diff --git a/src/multirust-cli/download_tracker.rs b/src/rustup-cli/download_tracker.rs similarity index 98% rename from src/multirust-cli/download_tracker.rs rename to src/rustup-cli/download_tracker.rs index dd9ad949ba..d88a741f66 100644 --- a/src/multirust-cli/download_tracker.rs +++ b/src/rustup-cli/download_tracker.rs @@ -2,9 +2,9 @@ use std::collections::VecDeque; use std::fmt; use term; use time::precise_time_s; -use multirust::Notification; -use multirust_dist::Notification as In; -use multirust_utils::Notification as Un; +use rustup::Notification; +use rustup_dist::Notification as In; +use rustup_utils::Notification as Un; use tty; /// Keep track of this many past download amounts diff --git a/src/multirust-cli/job.rs b/src/rustup-cli/job.rs similarity index 100% rename from src/multirust-cli/job.rs rename to src/rustup-cli/job.rs diff --git a/src/multirust-cli/log.rs b/src/rustup-cli/log.rs similarity index 100% rename from src/multirust-cli/log.rs rename to src/rustup-cli/log.rs diff --git a/src/multirust-cli/main.rs b/src/rustup-cli/main.rs similarity index 97% rename from src/multirust-cli/main.rs rename to src/rustup-cli/main.rs index 29760d4313..b1a3e05486 100644 --- a/src/multirust-cli/main.rs +++ b/src/rustup-cli/main.rs @@ -1,13 +1,13 @@ -extern crate multirust_dist; +extern crate rustup_dist; #[macro_use] -extern crate multirust_utils; +extern crate rustup_utils; #[macro_use] extern crate clap; extern crate regex; extern crate hyper; #[macro_use] -extern crate multirust; +extern crate rustup; extern crate term; extern crate openssl; extern crate itertools; @@ -42,7 +42,7 @@ mod term2; use std::env; use std::path::PathBuf; -use multirust::{Error, Result}; +use rustup::{Error, Result}; fn main() { if let Err(e) = run_multirust() { diff --git a/src/multirust-cli/multirust_mode.rs b/src/rustup-cli/multirust_mode.rs similarity index 99% rename from src/multirust-cli/multirust_mode.rs rename to src/rustup-cli/multirust_mode.rs index 548aa517f3..94872b663b 100644 --- a/src/multirust-cli/multirust_mode.rs +++ b/src/rustup-cli/multirust_mode.rs @@ -3,9 +3,9 @@ use cli; use common::{self, confirm, set_globals, run_inner, show_channel_update, show_tool_versions, update_all_channels}; -use multirust::*; -use multirust_dist::manifest::Component; -use multirust_dist::dist::TargetTriple; +use rustup::*; +use rustup_dist::manifest::Component; +use rustup_dist::dist::TargetTriple; use self_update; use std::env; use std::path::{Path, PathBuf}; diff --git a/src/multirust-cli/proxy_mode.rs b/src/rustup-cli/proxy_mode.rs similarity index 92% rename from src/multirust-cli/proxy_mode.rs rename to src/rustup-cli/proxy_mode.rs index 66011cac56..8e12c0ba69 100644 --- a/src/multirust-cli/proxy_mode.rs +++ b/src/rustup-cli/proxy_mode.rs @@ -1,6 +1,6 @@ use common::{run_inner, set_globals}; -use multirust::{Cfg, Result, Error}; -use multirust_utils::utils; +use rustup::{Cfg, Result, Error}; +use rustup_utils::utils; use std::env; use std::path::PathBuf; use job; diff --git a/src/multirust-cli/rustup_mode.rs b/src/rustup-cli/rustup_mode.rs similarity index 98% rename from src/multirust-cli/rustup_mode.rs rename to src/rustup-cli/rustup_mode.rs index cfbf890627..bb66b3fe81 100644 --- a/src/multirust-cli/rustup_mode.rs +++ b/src/rustup-cli/rustup_mode.rs @@ -1,9 +1,9 @@ use clap::{App, Arg, AppSettings, SubCommand, ArgMatches}; use common; -use multirust::{Result, Cfg, Error, Toolchain}; -use multirust_dist::manifest::Component; -use multirust_dist::dist::TargetTriple; -use multirust_utils::utils; +use rustup::{Result, Cfg, Error, Toolchain}; +use rustup_dist::manifest::Component; +use rustup_dist::dist::TargetTriple; +use rustup_utils::utils; use self_update; use std::path::Path; diff --git a/src/multirust-cli/self_update.rs b/src/rustup-cli/self_update.rs similarity index 99% rename from src/multirust-cli/self_update.rs rename to src/rustup-cli/self_update.rs index 1ce424c80b..e4c7914c67 100644 --- a/src/multirust-cli/self_update.rs +++ b/src/rustup-cli/self_update.rs @@ -32,10 +32,10 @@ use common::{self, confirm}; use itertools::Itertools; -use multirust::{Error, Result, NotifyHandler}; -use multirust_dist::dist; -use multirust_dist; -use multirust_utils::utils; +use rustup::{Error, Result, NotifyHandler}; +use rustup_dist::dist; +use rustup_dist; +use rustup_utils::utils; use openssl::crypto::hash::{Type, Hasher}; use std::env; use std::env::consts::EXE_SUFFIX; @@ -259,7 +259,7 @@ fn cleanup_legacy() -> Result<()> { #[cfg(windows)] fn legacy_multirust_home_dir() -> Result { - use multirust_utils::raw::windows::{ + use rustup_utils::raw::windows::{ get_special_folder, FOLDERID_LocalAppData }; @@ -500,7 +500,7 @@ fn delete_multirust_and_cargo_home() -> Result<()> { /// Run by multirust-gc-$num.exe to delete CARGO_HOME #[cfg(windows)] pub fn complete_windows_uninstall() -> Result<()> { - use multirust::NotifyHandler; + use rustup::NotifyHandler; use std::ffi::OsStr; use std::process::Stdio; @@ -939,7 +939,7 @@ pub fn prepare_update() -> Result> { // Check that hash is correct if latest_hash != download_hash { - return Err(Error::Install(multirust_dist::Error::ChecksumFailed { + return Err(Error::Install(rustup_dist::Error::ChecksumFailed { url: url, expected: latest_hash, calculated: download_hash, diff --git a/src/multirust-cli/setup_mode.rs b/src/rustup-cli/setup_mode.rs similarity index 98% rename from src/multirust-cli/setup_mode.rs rename to src/rustup-cli/setup_mode.rs index 515da8c074..a434352b8e 100644 --- a/src/multirust-cli/setup_mode.rs +++ b/src/rustup-cli/setup_mode.rs @@ -1,6 +1,6 @@ use std::env; use self_update; -use multirust::Result; +use rustup::Result; use clap::{App, Arg}; use common; diff --git a/src/multirust-cli/term2.rs b/src/rustup-cli/term2.rs similarity index 100% rename from src/multirust-cli/term2.rs rename to src/rustup-cli/term2.rs diff --git a/src/multirust-cli/tty.rs b/src/rustup-cli/tty.rs similarity index 100% rename from src/multirust-cli/tty.rs rename to src/rustup-cli/tty.rs diff --git a/src/multirust-dist/Cargo.toml b/src/rustup-dist/Cargo.toml similarity index 80% rename from src/multirust-dist/Cargo.toml rename to src/rustup-dist/Cargo.toml index 2af0c21d59..ed95fc9dfb 100644 --- a/src/multirust-dist/Cargo.toml +++ b/src/rustup-dist/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "multirust-dist" +name = "rustup-dist" version = "0.1.6" authors = [ "Diggory Blake " ] description = "Installation from a Rust distribution server" @@ -23,8 +23,8 @@ flate2 = "0.2.9" tempdir = "0.3.4" walkdir = "0.1.5" toml = "0.1.27" -multirust-mock = { path = "../multirust-mock" } -multirust-utils = { path = "../multirust-utils" } +rustup-mock = { path = "../rustup-mock" } +rustup-utils = { path = "../rustup-utils" } [lib] -name = "multirust_dist" +name = "rustup_dist" diff --git a/src/multirust-dist/build.rs b/src/rustup-dist/build.rs similarity index 100% rename from src/multirust-dist/build.rs rename to src/rustup-dist/build.rs diff --git a/src/multirust-dist/src/component/components.rs b/src/rustup-dist/src/component/components.rs similarity index 98% rename from src/multirust-dist/src/component/components.rs rename to src/rustup-dist/src/component/components.rs index 21dc7a74e3..e3f6056a0f 100644 --- a/src/multirust-dist/src/component/components.rs +++ b/src/rustup-dist/src/component/components.rs @@ -2,7 +2,7 @@ /// `Components` and `DirectoryPackage` are the two sides of the /// installation / uninstallation process. -use multirust_utils::{self, utils}; +use rustup_utils::{self, utils}; use prefix::InstallPrefix; use errors::*; @@ -118,7 +118,7 @@ impl<'a> ComponentBuilder<'a> { // FIXME: This writes relative paths to the component manifest, // but rust-installer writes absolute paths. try!(writeln!(file, "{}", part.encode()).map_err(|e| { - multirust_utils::Error::WritingFile { + rustup_utils::Error::WritingFile { name: "component", path: abs_path.clone(), error: e, diff --git a/src/multirust-dist/src/component/mod.rs b/src/rustup-dist/src/component/mod.rs similarity index 100% rename from src/multirust-dist/src/component/mod.rs rename to src/rustup-dist/src/component/mod.rs diff --git a/src/multirust-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs similarity index 99% rename from src/multirust-dist/src/component/package.rs rename to src/rustup-dist/src/component/package.rs index cc6865d8f7..28c948a6e7 100644 --- a/src/multirust-dist/src/component/package.rs +++ b/src/rustup-dist/src/component/package.rs @@ -9,7 +9,7 @@ use component::components::*; use component::transaction::*; use errors::*; -use multirust_utils::utils; +use rustup_utils::utils; use temp; use std::path::{Path, PathBuf}; diff --git a/src/multirust-dist/src/component/transaction.rs b/src/rustup-dist/src/component/transaction.rs similarity index 93% rename from src/multirust-dist/src/component/transaction.rs rename to src/rustup-dist/src/component/transaction.rs index 3f119394cc..56e2375681 100644 --- a/src/multirust-dist/src/component/transaction.rs +++ b/src/rustup-dist/src/component/transaction.rs @@ -9,7 +9,7 @@ //! FIXME: This uses ensure_dir_exists in some places but rollback //! does not remove any dirs created by it. -use multirust_utils::{self, utils}; +use rustup_utils::{self, utils}; use temp; use prefix::InstallPrefix; use errors::*; @@ -114,7 +114,7 @@ impl<'a> Transaction<'a> { let (item, mut file) = try!(ChangedItem::add_file(&self.prefix, component, relpath.clone())); self.change(item); try!(write!(file, "{}", content).map_err(|e| { - multirust_utils::Error::WritingFile { + rustup_utils::Error::WritingFile { name: "component", path: self.prefix.abs_path(&relpath), error: e, @@ -178,7 +178,7 @@ impl<'a> ChangedItem<'a> { AddedDir(ref path) => { try!(utils::remove_dir("component", &prefix.abs_path(path), - multirust_utils::NotifyHandler::none())) + rustup_utils::NotifyHandler::none())) } RemovedFile(ref path, ref tmp) | ModifiedFile(ref path, Some(ref tmp)) => { try!(utils::rename_file("component", &tmp, &prefix.abs_path(path))) @@ -204,10 +204,10 @@ impl<'a> ChangedItem<'a> { }) } else { if let Some(p) = abs_path.parent() { - try!(utils::ensure_dir_exists("component", p, multirust_utils::NotifyHandler::none())); + try!(utils::ensure_dir_exists("component", p, rustup_utils::NotifyHandler::none())); } let file = try!(File::create(&abs_path).map_err(|e| { - multirust_utils::Error::WritingFile { + rustup_utils::Error::WritingFile { name: "component", path: abs_path, error: e, @@ -229,7 +229,7 @@ impl<'a> ChangedItem<'a> { }) } else { if let Some(p) = abs_path.parent() { - try!(utils::ensure_dir_exists("component", p, multirust_utils::NotifyHandler::none())); + try!(utils::ensure_dir_exists("component", p, rustup_utils::NotifyHandler::none())); } try!(utils::copy_file(src, &abs_path)); Ok(ChangedItem::AddedFile(relpath)) @@ -244,9 +244,9 @@ impl<'a> ChangedItem<'a> { }) } else { if let Some(p) = abs_path.parent() { - try!(utils::ensure_dir_exists("component", p, multirust_utils::NotifyHandler::none())); + try!(utils::ensure_dir_exists("component", p, rustup_utils::NotifyHandler::none())); } - try!(utils::copy_dir(src, &abs_path, multirust_utils::NotifyHandler::none())); + try!(utils::copy_dir(src, &abs_path, rustup_utils::NotifyHandler::none())); Ok(ChangedItem::AddedDir(relpath)) } } @@ -285,7 +285,7 @@ impl<'a> ChangedItem<'a> { Ok(ChangedItem::ModifiedFile(relpath, Some(backup))) } else { if let Some(p) = abs_path.parent() { - try!(utils::ensure_dir_exists("component", p, multirust_utils::NotifyHandler::none())); + try!(utils::ensure_dir_exists("component", p, rustup_utils::NotifyHandler::none())); } Ok(ChangedItem::ModifiedFile(relpath, None)) } diff --git a/src/multirust-dist/src/config.rs b/src/rustup-dist/src/config.rs similarity index 100% rename from src/multirust-dist/src/config.rs rename to src/rustup-dist/src/config.rs diff --git a/src/multirust-dist/src/dist.rs b/src/rustup-dist/src/dist.rs similarity index 98% rename from src/multirust-dist/src/dist.rs rename to src/rustup-dist/src/dist.rs index fdb0718679..0951746bf9 100644 --- a/src/multirust-dist/src/dist.rs +++ b/src/rustup-dist/src/dist.rs @@ -1,7 +1,7 @@ use temp; use errors::*; -use multirust_utils::utils; +use rustup_utils::utils; use prefix::InstallPrefix; use manifest::Component; use manifest::Manifest as ManifestV2; @@ -412,8 +412,8 @@ pub fn update_from_dist<'a>(download: DownloadCfg<'a>, } } Ok(None) => return Ok(None), - Err(Error::Utils(::multirust_utils::errors::Error::DownloadingFile { - error: ::multirust_utils::raw::DownloadError::Status(hyper::status::StatusCode::NotFound), + Err(Error::Utils(::rustup_utils::errors::Error::DownloadingFile { + error: ::rustup_utils::raw::DownloadError::Status(hyper::status::StatusCode::NotFound), .. })) => { // Proceed to try v1 as a fallback diff --git a/src/multirust-dist/src/download.rs b/src/rustup-dist/src/download.rs similarity index 99% rename from src/multirust-dist/src/download.rs rename to src/rustup-dist/src/download.rs index 49716002bf..87f265aeea 100644 --- a/src/multirust-dist/src/download.rs +++ b/src/rustup-dist/src/download.rs @@ -1,5 +1,5 @@ use errors::*; -use multirust_utils::utils; +use rustup_utils::utils; use temp; use openssl::crypto::hash::{Type, Hasher}; diff --git a/src/multirust-dist/src/errors.rs b/src/rustup-dist/src/errors.rs similarity index 96% rename from src/multirust-dist/src/errors.rs rename to src/rustup-dist/src/errors.rs index a56a91e3d7..169af8190d 100644 --- a/src/multirust-dist/src/errors.rs +++ b/src/rustup-dist/src/errors.rs @@ -5,14 +5,14 @@ use std::io; use temp; use walkdir; use toml; -use multirust_utils; -use multirust_utils::notify::{self, NotificationLevel, Notifyable}; +use rustup_utils; +use rustup_utils::notify::{self, NotificationLevel, Notifyable}; use manifest::Component; use dist::TargetTriple; #[derive(Debug)] pub enum Notification<'a> { - Utils(multirust_utils::Notification<'a>), + Utils(rustup_utils::Notification<'a>), Temp(temp::Notification<'a>), Extracting(&'a Path, &'a Path), @@ -33,7 +33,7 @@ pub enum Notification<'a> { #[derive(Debug)] pub enum Error { - Utils(multirust_utils::Error), + Utils(rustup_utils::Error), Temp(temp::Error), InvalidFileExtension, @@ -69,7 +69,7 @@ pub enum Error { BadInstalledMetadataVersion(String), ComponentDirPermissionsFailed(walkdir::Error), ComponentFilePermissionsFailed(io::Error), - ComponentDownloadFailed(Component, multirust_utils::Error), + ComponentDownloadFailed(Component, rustup_utils::Error), ObsoleteDistManifest, Parsing(Vec), MissingKey(String), @@ -89,9 +89,9 @@ pub type SharedNotifyHandler = notify::SharedNotifyHandler Notifyable>>; extend_error!(Error: temp::Error, e => Error::Temp(e)); -extend_error!(Error: multirust_utils::Error, e => Error::Utils(e)); +extend_error!(Error: rustup_utils::Error, e => Error::Utils(e)); -extend_notification!(Notification: multirust_utils::Notification, n => Notification::Utils(n)); +extend_notification!(Notification: rustup_utils::Notification, n => Notification::Utils(n)); extend_notification!(Notification: temp::Notification, n => Notification::Temp(n)); impl<'a> Notification<'a> { @@ -347,10 +347,10 @@ impl Display for Error { } } NoManifestFound(ref ch, ref e) => { - use multirust_utils::raw::DownloadError; + use rustup_utils::raw::DownloadError; use hyper::status::StatusCode::NotFound; match **e { - Error::Utils(multirust_utils::Error::DownloadingFile { + Error::Utils(rustup_utils::Error::DownloadingFile { error: DownloadError::Status(NotFound), .. }) => { diff --git a/src/multirust-dist/src/lib.rs b/src/rustup-dist/src/lib.rs similarity index 93% rename from src/multirust-dist/src/lib.rs rename to src/rustup-dist/src/lib.rs index bfae5e50a7..4be62c7821 100644 --- a/src/multirust-dist/src/lib.rs +++ b/src/rustup-dist/src/lib.rs @@ -8,7 +8,7 @@ extern crate toml; extern crate flate2; extern crate tar; #[macro_use] -extern crate multirust_utils; +extern crate rustup_utils; pub use errors::{Error, Notification, NotifyHandler}; diff --git a/src/multirust-dist/src/manifest.rs b/src/rustup-dist/src/manifest.rs similarity index 100% rename from src/multirust-dist/src/manifest.rs rename to src/rustup-dist/src/manifest.rs diff --git a/src/multirust-dist/src/manifestation.rs b/src/rustup-dist/src/manifestation.rs similarity index 99% rename from src/multirust-dist/src/manifestation.rs rename to src/rustup-dist/src/manifestation.rs index 85ae10ebe8..bcc46ff5e9 100644 --- a/src/multirust-dist/src/manifestation.rs +++ b/src/rustup-dist/src/manifestation.rs @@ -7,7 +7,7 @@ use dist::{download_and_check, DownloadCfg, TargetTriple}; use component::{Components, Transaction, TarGzPackage, Package}; use temp; use errors::*; -use multirust_utils::utils; +use rustup_utils::utils; use prefix::InstallPrefix; use openssl::crypto::hash::{Type, Hasher}; use itertools::Itertools; diff --git a/src/multirust-dist/src/prefix.rs b/src/rustup-dist/src/prefix.rs similarity index 100% rename from src/multirust-dist/src/prefix.rs rename to src/rustup-dist/src/prefix.rs diff --git a/src/multirust-dist/src/temp.rs b/src/rustup-dist/src/temp.rs similarity index 98% rename from src/multirust-dist/src/temp.rs rename to src/rustup-dist/src/temp.rs index d249752c7e..826b666ed5 100644 --- a/src/multirust-dist/src/temp.rs +++ b/src/rustup-dist/src/temp.rs @@ -4,9 +4,9 @@ use std::path::{Path, PathBuf}; use std::io; use std::ops; use std::fmt::{self, Display}; -use multirust_utils::raw; +use rustup_utils::raw; -use multirust_utils::notify::{self, NotificationLevel, Notifyable}; +use rustup_utils::notify::{self, NotificationLevel, Notifyable}; #[derive(Debug)] pub enum Error { diff --git a/src/multirust-dist/src/toml_utils.rs b/src/rustup-dist/src/toml_utils.rs similarity index 100% rename from src/multirust-dist/src/toml_utils.rs rename to src/rustup-dist/src/toml_utils.rs diff --git a/src/multirust-dist/tests/channel-rust-nightly-example.toml b/src/rustup-dist/tests/channel-rust-nightly-example.toml similarity index 100% rename from src/multirust-dist/tests/channel-rust-nightly-example.toml rename to src/rustup-dist/tests/channel-rust-nightly-example.toml diff --git a/src/multirust-dist/tests/channel-rust-nightly-example2.toml b/src/rustup-dist/tests/channel-rust-nightly-example2.toml similarity index 100% rename from src/multirust-dist/tests/channel-rust-nightly-example2.toml rename to src/rustup-dist/tests/channel-rust-nightly-example2.toml diff --git a/src/multirust-dist/tests/dist.rs b/src/rustup-dist/tests/dist.rs similarity index 98% rename from src/multirust-dist/tests/dist.rs rename to src/rustup-dist/tests/dist.rs index 554d0af64f..833e7e0ef3 100644 --- a/src/multirust-dist/tests/dist.rs +++ b/src/rustup-dist/tests/dist.rs @@ -1,9 +1,9 @@ // Tests of installation and updates from a v2 Rust distribution // server (mocked on the file system) -extern crate multirust_dist; -extern crate multirust_utils; -extern crate multirust_mock; +extern crate rustup_dist; +extern crate rustup_utils; +extern crate rustup_mock; extern crate tempdir; extern crate tar; extern crate openssl; @@ -13,17 +13,17 @@ extern crate walkdir; extern crate itertools; extern crate hyper; -use multirust_mock::dist::*; -use multirust_mock::{MockCommand, MockInstallerBuilder}; -use multirust_dist::prefix::InstallPrefix; -use multirust_dist::{Error, NotifyHandler}; -use multirust_dist::dist::{ToolchainDesc, TargetTriple}; -use multirust_dist::download::DownloadCfg; -use multirust_utils::utils; -use multirust_utils::raw as utils_raw; -use multirust_dist::temp; -use multirust_dist::manifestation::{Manifestation, UpdateStatus, Changes}; -use multirust_dist::manifest::{Manifest, Component}; +use rustup_mock::dist::*; +use rustup_mock::{MockCommand, MockInstallerBuilder}; +use rustup_dist::prefix::InstallPrefix; +use rustup_dist::{Error, NotifyHandler}; +use rustup_dist::dist::{ToolchainDesc, TargetTriple}; +use rustup_dist::download::DownloadCfg; +use rustup_utils::utils; +use rustup_utils::raw as utils_raw; +use rustup_dist::temp; +use rustup_dist::manifestation::{Manifestation, UpdateStatus, Changes}; +use rustup_dist::manifest::{Manifest, Component}; use hyper::Url; use std::fs; use std::io::Write; diff --git a/src/multirust-dist/tests/install.rs b/src/rustup-dist/tests/install.rs similarity index 96% rename from src/multirust-dist/tests/install.rs rename to src/rustup-dist/tests/install.rs index dd17b745cf..158d20121d 100644 --- a/src/multirust-dist/tests/install.rs +++ b/src/rustup-dist/tests/install.rs @@ -1,19 +1,19 @@ -extern crate multirust_dist; -extern crate multirust_utils; -extern crate multirust_mock; +extern crate rustup_dist; +extern crate rustup_utils; +extern crate rustup_mock; extern crate tempdir; -use multirust_dist::component::Components; -use multirust_dist::component::{DirectoryPackage, Package}; -use multirust_dist::component::Transaction; -use multirust_dist::temp; -use multirust_utils::utils; -use multirust_dist::NotifyHandler; -use multirust_dist::prefix::InstallPrefix; +use rustup_dist::component::Components; +use rustup_dist::component::{DirectoryPackage, Package}; +use rustup_dist::component::Transaction; +use rustup_dist::temp; +use rustup_utils::utils; +use rustup_dist::NotifyHandler; +use rustup_dist::prefix::InstallPrefix; use std::fs::File; use std::io::Write; use tempdir::TempDir; -use multirust_mock::{MockInstallerBuilder, MockCommand}; +use rustup_mock::{MockInstallerBuilder, MockCommand}; // Just testing that the mocks work #[test] @@ -261,7 +261,7 @@ fn component_bad_version() { // Can't open components now let e = Components::open(prefix.clone()).unwrap_err(); - if let multirust_dist::Error::BadInstalledMetadataVersion(_) = e { } else { panic!() } + if let rustup_dist::Error::BadInstalledMetadataVersion(_) = e { } else { panic!() } } // Directories should be 0755, normal files 0644, files that come diff --git a/src/multirust-dist/tests/manifest.rs b/src/rustup-dist/tests/manifest.rs similarity index 95% rename from src/multirust-dist/tests/manifest.rs rename to src/rustup-dist/tests/manifest.rs index a92f047a06..cdd004865b 100644 --- a/src/multirust-dist/tests/manifest.rs +++ b/src/rustup-dist/tests/manifest.rs @@ -1,8 +1,8 @@ -extern crate multirust_dist; +extern crate rustup_dist; -use multirust_dist::manifest::Manifest; -use multirust_dist::Error; -use multirust_dist::dist::TargetTriple; +use rustup_dist::manifest::Manifest; +use rustup_dist::Error; +use rustup_dist::dist::TargetTriple; // Example manifest from https://public.etherpad-mozilla.org/p/Rust-infra-work-week static EXAMPLE: &'static str = include_str!("channel-rust-nightly-example.toml"); diff --git a/src/multirust-dist/tests/transactions.rs b/src/rustup-dist/tests/transactions.rs similarity index 98% rename from src/multirust-dist/tests/transactions.rs rename to src/rustup-dist/tests/transactions.rs index a128fab0e7..7ac7357246 100644 --- a/src/multirust-dist/tests/transactions.rs +++ b/src/rustup-dist/tests/transactions.rs @@ -1,14 +1,14 @@ -extern crate multirust_dist; -extern crate multirust_utils; +extern crate rustup_dist; +extern crate rustup_utils; extern crate tempdir; -use multirust_dist::NotifyHandler; -use multirust_dist::prefix::InstallPrefix; -use multirust_dist::component::Transaction; -use multirust_dist::temp; -use multirust_utils::utils; -use multirust_utils::raw as utils_raw; -use multirust_dist::Error; +use rustup_dist::NotifyHandler; +use rustup_dist::prefix::InstallPrefix; +use rustup_dist::component::Transaction; +use rustup_dist::temp; +use rustup_utils::utils; +use rustup_utils::raw as utils_raw; +use rustup_dist::Error; use tempdir::TempDir; use std::fs; use std::io::Write; diff --git a/src/multirust-mock/Cargo.toml b/src/rustup-mock/Cargo.toml similarity index 95% rename from src/multirust-mock/Cargo.toml rename to src/rustup-mock/Cargo.toml index cbc8dbcbf3..1207211c51 100644 --- a/src/multirust-mock/Cargo.toml +++ b/src/rustup-mock/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "multirust-mock" +name = "rustup-mock" version = "0.1.6" authors = [ "Diggory Blake " ] description = "Test mocks for multirust" diff --git a/src/multirust-mock/src/clitools.rs b/src/rustup-mock/src/clitools.rs similarity index 100% rename from src/multirust-mock/src/clitools.rs rename to src/rustup-mock/src/clitools.rs diff --git a/src/multirust-mock/src/dist.rs b/src/rustup-mock/src/dist.rs similarity index 100% rename from src/multirust-mock/src/dist.rs rename to src/rustup-mock/src/dist.rs diff --git a/src/multirust-mock/src/lib.rs b/src/rustup-mock/src/lib.rs similarity index 100% rename from src/multirust-mock/src/lib.rs rename to src/rustup-mock/src/lib.rs diff --git a/src/multirust-utils/Cargo.toml b/src/rustup-utils/Cargo.toml similarity index 98% rename from src/multirust-utils/Cargo.toml rename to src/rustup-utils/Cargo.toml index 4ddd6133c9..eb4a8b16a4 100644 --- a/src/multirust-utils/Cargo.toml +++ b/src/rustup-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "multirust-utils" +name = "rustup-utils" version = "0.1.6" authors = [ "Diggory Blake " ] description = "multirust in rust - manage multiple rust installations with ease" diff --git a/src/multirust-utils/src/errors.rs b/src/rustup-utils/src/errors.rs similarity index 100% rename from src/multirust-utils/src/errors.rs rename to src/rustup-utils/src/errors.rs diff --git a/src/multirust-utils/src/lib.rs b/src/rustup-utils/src/lib.rs similarity index 100% rename from src/multirust-utils/src/lib.rs rename to src/rustup-utils/src/lib.rs diff --git a/src/multirust-utils/src/notify.rs b/src/rustup-utils/src/notify.rs similarity index 100% rename from src/multirust-utils/src/notify.rs rename to src/rustup-utils/src/notify.rs diff --git a/src/multirust-utils/src/raw.rs b/src/rustup-utils/src/raw.rs similarity index 100% rename from src/multirust-utils/src/raw.rs rename to src/rustup-utils/src/raw.rs diff --git a/src/multirust-utils/src/utils.rs b/src/rustup-utils/src/utils.rs similarity index 100% rename from src/multirust-utils/src/utils.rs rename to src/rustup-utils/src/utils.rs diff --git a/src/multirust/config.rs b/src/rustup/config.rs similarity index 98% rename from src/multirust/config.rs rename to src/rustup/config.rs index 075f4ec723..1d78bdb021 100644 --- a/src/multirust/config.rs +++ b/src/rustup/config.rs @@ -8,8 +8,8 @@ use std::fmt::{self, Display}; use itertools::Itertools; use errors::*; -use multirust_dist::{temp, dist}; -use multirust_utils::utils; +use rustup_dist::{temp, dist}; +use rustup_utils::utils; use override_db::OverrideDB; use toolchain::{Toolchain, UpdateStatus}; @@ -180,7 +180,7 @@ impl Cfg { for dir in dirs { let dir = try!(dir.map_err(|e| Error::UpgradeIoError(e))); try!(utils::remove_dir("toolchain", &dir.path(), - ::multirust_utils::NotifyHandler::some(&self.notify_handler))); + ::rustup_utils::NotifyHandler::some(&self.notify_handler))); } // Also delete the update hashes diff --git a/src/multirust/env_var.rs b/src/rustup/env_var.rs similarity index 100% rename from src/multirust/env_var.rs rename to src/rustup/env_var.rs diff --git a/src/multirust/errors.rs b/src/rustup/errors.rs similarity index 94% rename from src/multirust/errors.rs rename to src/rustup/errors.rs index efb9549594..5e337d26ee 100644 --- a/src/multirust/errors.rs +++ b/src/rustup/errors.rs @@ -3,15 +3,15 @@ use std::error; use std::fmt::{self, Display}; use std::io; -use multirust_dist::{self, temp}; -use multirust_utils; -use multirust_utils::notify::{self, NotificationLevel, Notifyable}; -use multirust_dist::manifest::Component; +use rustup_dist::{self, temp}; +use rustup_utils; +use rustup_utils::notify::{self, NotificationLevel, Notifyable}; +use rustup_dist::manifest::Component; #[derive(Debug)] pub enum Notification<'a> { - Install(multirust_dist::Notification<'a>), - Utils(multirust_utils::Notification<'a>), + Install(rustup_dist::Notification<'a>), + Utils(rustup_utils::Notification<'a>), Temp(temp::Notification<'a>), SetDefaultToolchain(&'a str), @@ -37,8 +37,8 @@ pub enum Notification<'a> { #[derive(Debug)] pub enum Error { - Install(multirust_dist::Error), - Utils(multirust_utils::Error), + Install(rustup_dist::Error), + Utils(rustup_utils::Error), Temp(temp::Error), UnknownMetadataVersion(String), @@ -71,12 +71,12 @@ pub type Result = ::std::result::Result; pub type NotifyHandler<'a> = notify::NotifyHandler<'a, for<'b> Notifyable>>; pub type SharedNotifyHandler = notify::SharedNotifyHandler Notifyable>>; -extend_error!(Error: multirust_dist::Error, e => Error::Install(e)); -extend_error!(Error: multirust_utils::Error, e => Error::Utils(e)); +extend_error!(Error: rustup_dist::Error, e => Error::Install(e)); +extend_error!(Error: rustup_utils::Error, e => Error::Utils(e)); extend_error!(Error: temp::Error, e => Error::Temp(e)); -extend_notification!(Notification: multirust_dist::Notification, n => Notification::Install(n)); -extend_notification!(Notification: multirust_utils::Notification, n => Notification::Utils(n)); +extend_notification!(Notification: rustup_dist::Notification, n => Notification::Install(n)); +extend_notification!(Notification: rustup_utils::Notification, n => Notification::Utils(n)); extend_notification!(Notification: temp::Notification, n => Notification::Temp(n)); impl<'a> Notification<'a> { diff --git a/src/multirust/install.rs b/src/rustup/install.rs similarity index 91% rename from src/multirust/install.rs rename to src/rustup/install.rs index b735591893..5a3c237ce0 100644 --- a/src/multirust/install.rs +++ b/src/rustup/install.rs @@ -1,12 +1,12 @@ //! Installation and upgrade of both distribution-managed and local //! toolchains -use multirust_dist::{NotifyHandler, Notification}; -use multirust_dist::prefix::InstallPrefix; -use multirust_utils::utils; -use multirust_dist::temp; -use multirust_dist::dist; -use multirust_dist::component::{Components, TarGzPackage, Transaction, Package}; +use rustup_dist::{NotifyHandler, Notification}; +use rustup_dist::prefix::InstallPrefix; +use rustup_utils::utils; +use rustup_dist::temp; +use rustup_dist::dist; +use rustup_dist::component::{Components, TarGzPackage, Transaction, Package}; use errors::Result; use std::path::Path; diff --git a/src/multirust/lib.rs b/src/rustup/lib.rs similarity index 70% rename from src/multirust/lib.rs rename to src/rustup/lib.rs index d5744833a1..8c9858a867 100644 --- a/src/multirust/lib.rs +++ b/src/rustup/lib.rs @@ -1,6 +1,6 @@ -extern crate multirust_dist; +extern crate rustup_dist; #[macro_use] -extern crate multirust_utils; +extern crate rustup_utils; extern crate hyper; extern crate regex; extern crate itertools; @@ -9,7 +9,7 @@ pub use errors::*; pub use config::*; pub use toolchain::*; pub use override_db::*; -pub use multirust_utils::{utils, notify}; +pub use rustup_utils::{utils, notify}; mod errors; mod override_db; diff --git a/src/multirust/override_db.rs b/src/rustup/override_db.rs similarity index 98% rename from src/multirust/override_db.rs rename to src/rustup/override_db.rs index 6c3a957f47..5c5c4a52e0 100644 --- a/src/multirust/override_db.rs +++ b/src/rustup/override_db.rs @@ -1,8 +1,8 @@ use std::path::{Path, PathBuf}; use errors::*; -use multirust_dist::temp; -use multirust_utils::utils; +use rustup_dist::temp; +use rustup_utils::utils; pub const DB_DELIMITER: &'static str = ";"; diff --git a/src/multirust/rust-key.gpg.ascii b/src/rustup/rust-key.gpg.ascii similarity index 100% rename from src/multirust/rust-key.gpg.ascii rename to src/rustup/rust-key.gpg.ascii diff --git a/src/multirust/toolchain.rs b/src/rustup/toolchain.rs similarity index 97% rename from src/multirust/toolchain.rs rename to src/rustup/toolchain.rs index 38e85fb795..c2000a1fe1 100644 --- a/src/multirust/toolchain.rs +++ b/src/rustup/toolchain.rs @@ -1,10 +1,10 @@ use errors::*; -use multirust_dist::dist; -use multirust_utils::utils; -use multirust_dist::prefix::InstallPrefix; -use multirust_dist::dist::{ToolchainDesc}; -use multirust_dist::manifestation::{Manifestation, Changes}; -use multirust_dist::manifest::Component; +use rustup_dist::dist; +use rustup_utils::utils; +use rustup_dist::prefix::InstallPrefix; +use rustup_dist::dist::{ToolchainDesc}; +use rustup_dist::manifestation::{Manifestation, Changes}; +use rustup_dist::manifest::Component; use config::Cfg; use env_var; use install::{self, InstallMethod}; @@ -162,7 +162,7 @@ impl<'a> Toolchain<'a> { fn ensure_custom(&self) -> Result<()> { if !self.is_custom() { - Err(Error::Install(::multirust_dist::Error::InvalidCustomToolchainName(self.name.to_string()))) + Err(Error::Install(::rustup_dist::Error::InvalidCustomToolchainName(self.name.to_string()))) } else { Ok(()) } diff --git a/tests/cli-exact.rs b/tests/cli-exact.rs index 1d3a9df40c..f8789e1194 100644 --- a/tests/cli-exact.rs +++ b/tests/cli-exact.rs @@ -1,10 +1,10 @@ //! Yet more cli test cases. These are testing that the output //! is exactly as expected. -extern crate multirust_dist; -extern crate multirust_mock; +extern crate rustup_dist; +extern crate rustup_mock; -use multirust_mock::clitools::{self, Config, Scenario, +use rustup_mock::clitools::{self, Config, Scenario, expect_ok, expect_ok_ex, expect_err_ex, this_host_triple}; diff --git a/tests/cli-misc.rs b/tests/cli-misc.rs index 81033db908..4d100852d5 100644 --- a/tests/cli-misc.rs +++ b/tests/cli-misc.rs @@ -1,11 +1,11 @@ //! Test cases of the multirust command that do not depend on the //! dist server, mostly derived from multirust/test-v2.sh -extern crate multirust_dist; -extern crate multirust_utils; -extern crate multirust_mock; +extern crate rustup_dist; +extern crate rustup_utils; +extern crate rustup_mock; -use multirust_mock::clitools::{self, Config, Scenario, +use rustup_mock::clitools::{self, Config, Scenario, expect_stdout_ok, expect_stderr_ok, expect_ok, expect_err, run, this_host_triple}; @@ -492,7 +492,7 @@ fn running_with_v2_metadata() { setup(&|config| { expect_ok(config, &["multirust", "default", "nightly"]); // Replace the metadata version - multirust_utils::raw::write_file(&config.rustupdir.join("version"), + rustup_utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); expect_err(config, &["multirust", "default", "nightly"], "rustup's metadata is out of date. run `rustup self upgrade-data`"); @@ -506,7 +506,7 @@ fn running_with_v2_metadata_rustup() { setup(&|config| { expect_ok(config, &["rustup", "default", "nightly"]); // Replace the metadata version - multirust_utils::raw::write_file(&config.rustupdir.join("version"), + rustup_utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); expect_err(config, &["rustup", "default", "nightly"], "rustup's metadata is out of date. run `rustup self upgrade-data`"); @@ -523,7 +523,7 @@ fn upgrade_v2_metadata_to_v12() { setup(&|config| { expect_ok(config, &["multirust", "default", "nightly"]); // Replace the metadata version - multirust_utils::raw::write_file(&config.rustupdir.join("version"), + rustup_utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); expect_stderr_ok(config, &["multirust", "upgrade-data"], "warning: this upgrade will remove all existing toolchains. you will need to reinstall them"); @@ -545,7 +545,7 @@ fn upgrade_v2_metadata_to_v12_rustup() { setup(&|config| { expect_ok(config, &["rustup", "default", "nightly"]); // Replace the metadata version - multirust_utils::raw::write_file(&config.rustupdir.join("version"), + rustup_utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); expect_stderr_ok(config, &["rustup", "self", "upgrade-data"], "warning: this upgrade will remove all existing toolchains. you will need to reinstall them"); diff --git a/tests/cli-rustup.rs b/tests/cli-rustup.rs index e37f472f0e..353d48b5a0 100644 --- a/tests/cli-rustup.rs +++ b/tests/cli-rustup.rs @@ -1,11 +1,11 @@ //! Test cases for new rustup UI -extern crate multirust_dist; -extern crate multirust_utils; -extern crate multirust_mock; +extern crate rustup_dist; +extern crate rustup_utils; +extern crate rustup_mock; extern crate tempdir; -use multirust_mock::clitools::{self, Config, Scenario, +use rustup_mock::clitools::{self, Config, Scenario, expect_ok, expect_ok_ex, expect_stdout_ok, expect_err_ex, diff --git a/tests/cli-self-update.rs b/tests/cli-self-update.rs index 3d55b66052..fcb7ed1e8f 100644 --- a/tests/cli-self-update.rs +++ b/tests/cli-self-update.rs @@ -1,7 +1,7 @@ //! Testing self install, uninstall and update -extern crate multirust_mock; -extern crate multirust_utils; +extern crate rustup_mock; +extern crate rustup_utils; #[macro_use] extern crate lazy_static; extern crate tempdir; @@ -19,15 +19,15 @@ use std::env::consts::EXE_SUFFIX; use std::path::Path; use std::fs; use std::process::Command; -use multirust_mock::clitools::{self, Config, Scenario, +use rustup_mock::clitools::{self, Config, Scenario, expect_ok, expect_ok_ex, expect_stdout_ok, expect_err, expect_err_ex, this_host_triple}; #[cfg(windows)] -use multirust_mock::clitools::expect_stderr_ok; -use multirust_mock::dist::{create_hash, calc_hash}; -use multirust_utils::raw; +use rustup_mock::clitools::expect_stderr_ok; +use rustup_mock::dist::{create_hash, calc_hash}; +use rustup_utils::raw; macro_rules! for_host { ($s: expr) => (&format!($s, this_host_triple())) } @@ -403,7 +403,7 @@ fn restore_path(p: &Option) { use winreg::{RegKey, RegValue}; use winreg::enums::RegType; use winapi::*; - use multirust_utils::utils; + use rustup_utils::utils; let root = RegKey::predef(HKEY_CURRENT_USER); let environment = root.open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE).unwrap(); diff --git a/tests/cli-v1.rs b/tests/cli-v1.rs index 9071cbf31f..69eb0dfd24 100644 --- a/tests/cli-v1.rs +++ b/tests/cli-v1.rs @@ -1,14 +1,14 @@ //! Test cases of the multirust command, using v1 manifests, mostly //! derived from multirust/test-v2.sh -extern crate multirust_dist; -extern crate multirust_utils; -extern crate multirust_mock; +extern crate rustup_dist; +extern crate rustup_utils; +extern crate rustup_mock; extern crate tempdir; use std::fs; use tempdir::TempDir; -use multirust_mock::clitools::{self, Config, Scenario, +use rustup_mock::clitools::{self, Config, Scenario, expect_ok, expect_stdout_ok, expect_err, expect_stderr_ok, set_current_dist_date, change_dir, run, this_host_triple}; @@ -166,11 +166,11 @@ fn remove_override_toolchain_error_handling() { fn bad_sha_on_manifest() { setup(&|config| { let sha_file = config.distdir.join("dist/channel-rust-nightly.sha256"); - let sha_str = multirust_utils::raw::read_file(&sha_file).unwrap(); + let sha_str = rustup_utils::raw::read_file(&sha_file).unwrap(); let mut sha_bytes = sha_str.into_bytes(); &mut sha_bytes[..10].clone_from_slice(b"aaaaaaaaaa"); let sha_str = String::from_utf8(sha_bytes).unwrap(); - multirust_utils::raw::write_file(&sha_file, &sha_str).unwrap(); + rustup_utils::raw::write_file(&sha_file, &sha_str).unwrap(); expect_err(config, &["multirust", "default", "nightly"], "checksum failed"); }); @@ -183,7 +183,7 @@ fn bad_sha_on_installer() { for file in fs::read_dir(&dir).unwrap() { let file = file.unwrap(); if file.path().to_string_lossy().ends_with(".tar.gz") { - multirust_utils::raw::write_file(&file.path(), "xxx").unwrap(); + rustup_utils::raw::write_file(&file.path(), "xxx").unwrap(); } } expect_err(config, &["multirust", "default", "nightly"], diff --git a/tests/cli-v2.rs b/tests/cli-v2.rs index b72e3d8878..3b89468a62 100644 --- a/tests/cli-v2.rs +++ b/tests/cli-v2.rs @@ -1,19 +1,19 @@ //! Test cases of the multirust command, using v2 manifests, mostly //! derived from multirust/test-v2.sh -extern crate multirust_dist; -extern crate multirust_utils; -extern crate multirust_mock; +extern crate rustup_dist; +extern crate rustup_utils; +extern crate rustup_mock; extern crate tempdir; use std::fs; use tempdir::TempDir; -use multirust_mock::clitools::{self, Config, Scenario, +use rustup_mock::clitools::{self, Config, Scenario, expect_ok, expect_stdout_ok, expect_err, expect_stderr_ok, set_current_dist_date, change_dir, run, this_host_triple}; -use multirust_dist::dist::TargetTriple; +use rustup_dist::dist::TargetTriple; macro_rules! for_host { ($s: expr) => (&format!($s, this_host_triple())) } @@ -169,11 +169,11 @@ fn bad_sha_on_manifest() { setup(&|config| { // Corrupt the sha let sha_file = config.distdir.join("dist/channel-rust-nightly.toml.sha256"); - let sha_str = multirust_utils::raw::read_file(&sha_file).unwrap(); + let sha_str = rustup_utils::raw::read_file(&sha_file).unwrap(); let mut sha_bytes = sha_str.into_bytes(); &mut sha_bytes[..10].clone_from_slice(b"aaaaaaaaaa"); let sha_str = String::from_utf8(sha_bytes).unwrap(); - multirust_utils::raw::write_file(&sha_file, &sha_str).unwrap(); + rustup_utils::raw::write_file(&sha_file, &sha_str).unwrap(); expect_err(config, &["multirust", "default", "nightly"], "checksum failed"); }); @@ -187,7 +187,7 @@ fn bad_sha_on_installer() { for file in fs::read_dir(&dir).unwrap() { let file = file.unwrap(); if file.path().to_string_lossy().ends_with(".tar.gz") { - multirust_utils::raw::write_file(&file.path(), "xxx").unwrap(); + rustup_utils::raw::write_file(&file.path(), "xxx").unwrap(); } } expect_err(config, &["multirust", "default", "nightly"], @@ -691,11 +691,11 @@ fn remove_target_host() { } fn make_component_unavailable(config: &Config, name: &str, target: &TargetTriple) { - use multirust_dist::manifest::Manifest; - use multirust_mock::dist::create_hash; + use rustup_dist::manifest::Manifest; + use rustup_mock::dist::create_hash; let ref manifest_path = config.distdir.join("dist/channel-rust-nightly.toml"); - let ref manifest_str = multirust_utils::raw::read_file(manifest_path).unwrap(); + let ref manifest_str = rustup_utils::raw::read_file(manifest_path).unwrap(); let mut manifest = Manifest::parse(manifest_str).unwrap(); { let mut std_pkg = manifest.packages.get_mut(name).unwrap(); @@ -703,7 +703,7 @@ fn make_component_unavailable(config: &Config, name: &str, target: &TargetTriple target_pkg.available = false; } let ref manifest_str = manifest.stringify(); - multirust_utils::raw::write_file(manifest_path, manifest_str).unwrap(); + rustup_utils::raw::write_file(manifest_path, manifest_str).unwrap(); // Have to update the hash too let ref hash_path = manifest_path.with_extension("toml.sha256");