From aad5891ed330d46ee676e0f2ea94fd0aabe04596 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 10 Mar 2019 16:19:14 +0000 Subject: [PATCH 1/6] Workaround for a deprecation in error_chain! --- src/download/src/lib.rs | 1 + src/rustup-cli/main.rs | 1 + src/rustup-dist/src/lib.rs | 1 + src/rustup-utils/src/lib.rs | 1 + src/rustup/lib.rs | 1 + 5 files changed, 5 insertions(+) diff --git a/src/download/src/lib.rs b/src/download/src/lib.rs index 5c24862384..d1139b6e55 100644 --- a/src/download/src/lib.rs +++ b/src/download/src/lib.rs @@ -3,6 +3,7 @@ use std::path::Path; use url::Url; +#[allow(deprecated)] // WORKAROUND https://github.com/rust-lang-nursery/error-chain/issues/254 mod errors; pub use crate::errors::*; diff --git a/src/rustup-cli/main.rs b/src/rustup-cli/main.rs index f1533e89f4..4e837ddcd3 100644 --- a/src/rustup-cli/main.rs +++ b/src/rustup-cli/main.rs @@ -18,6 +18,7 @@ mod log; mod common; mod download_tracker; +#[allow(deprecated)] // WORKAROUND https://github.com/rust-lang-nursery/error-chain/issues/254 mod errors; mod help; mod job; diff --git a/src/rustup-dist/src/lib.rs b/src/rustup-dist/src/lib.rs index aa70f9ddfe..56917e1c16 100644 --- a/src/rustup-dist/src/lib.rs +++ b/src/rustup-dist/src/lib.rs @@ -9,6 +9,7 @@ pub mod component; pub mod config; pub mod dist; pub mod download; +#[allow(deprecated)] // WORKAROUND https://github.com/rust-lang-nursery/error-chain/issues/254 pub mod errors; pub mod manifest; pub mod manifestation; diff --git a/src/rustup-utils/src/lib.rs b/src/rustup-utils/src/lib.rs index 3ff5e740c0..ab9ab8f27c 100644 --- a/src/rustup-utils/src/lib.rs +++ b/src/rustup-utils/src/lib.rs @@ -1,5 +1,6 @@ #![recursion_limit = "1024"] // for error_chain! +#[allow(deprecated)] // WORKAROUND https://github.com/rust-lang-nursery/error-chain/issues/254 pub mod errors; pub mod notifications; pub mod raw; diff --git a/src/rustup/lib.rs b/src/rustup/lib.rs index c2a35ffa0a..fa8e388ca2 100644 --- a/src/rustup/lib.rs +++ b/src/rustup/lib.rs @@ -50,6 +50,7 @@ fn component_for_bin(binary: &str) -> Option<&'static str> { pub mod command; mod config; pub mod env_var; +#[allow(deprecated)] // WORKAROUND https://github.com/rust-lang-nursery/error-chain/issues/254 mod errors; mod install; mod notifications; From 081d2209ac650ab02cec6f5af1478e611c5a996c Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 10 Mar 2019 16:20:00 +0000 Subject: [PATCH 2/6] Unnest the rustup crate --- Cargo.toml | 2 +- src/{rustup => }/command.rs | 0 src/{rustup => }/config.rs | 0 src/{rustup => }/env_var.rs | 0 src/{rustup => }/errors.rs | 0 src/{rustup => }/install.rs | 0 src/{rustup => }/lib.rs | 0 src/{rustup => }/notifications.rs | 0 src/{rustup => }/rust-key.gpg.ascii | 0 src/{rustup => }/settings.rs | 0 src/{rustup => }/toolchain.rs | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename src/{rustup => }/command.rs (100%) rename src/{rustup => }/config.rs (100%) rename src/{rustup => }/env_var.rs (100%) rename src/{rustup => }/errors.rs (100%) rename src/{rustup => }/install.rs (100%) rename src/{rustup => }/lib.rs (100%) rename src/{rustup => }/notifications.rs (100%) rename src/{rustup => }/rust-key.gpg.ascii (100%) rename src/{rustup => }/settings.rs (100%) rename src/{rustup => }/toolchain.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index b5485de228..2e8efb8d5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,7 @@ members = ["src/download"] [lib] name = "rustup" -path = "src/rustup/lib.rs" +path = "src/lib.rs" test = false # no unit tests [[bin]] diff --git a/src/rustup/command.rs b/src/command.rs similarity index 100% rename from src/rustup/command.rs rename to src/command.rs diff --git a/src/rustup/config.rs b/src/config.rs similarity index 100% rename from src/rustup/config.rs rename to src/config.rs diff --git a/src/rustup/env_var.rs b/src/env_var.rs similarity index 100% rename from src/rustup/env_var.rs rename to src/env_var.rs diff --git a/src/rustup/errors.rs b/src/errors.rs similarity index 100% rename from src/rustup/errors.rs rename to src/errors.rs diff --git a/src/rustup/install.rs b/src/install.rs similarity index 100% rename from src/rustup/install.rs rename to src/install.rs diff --git a/src/rustup/lib.rs b/src/lib.rs similarity index 100% rename from src/rustup/lib.rs rename to src/lib.rs diff --git a/src/rustup/notifications.rs b/src/notifications.rs similarity index 100% rename from src/rustup/notifications.rs rename to src/notifications.rs diff --git a/src/rustup/rust-key.gpg.ascii b/src/rust-key.gpg.ascii similarity index 100% rename from src/rustup/rust-key.gpg.ascii rename to src/rust-key.gpg.ascii diff --git a/src/rustup/settings.rs b/src/settings.rs similarity index 100% rename from src/rustup/settings.rs rename to src/settings.rs diff --git a/src/rustup/toolchain.rs b/src/toolchain.rs similarity index 100% rename from src/rustup/toolchain.rs rename to src/toolchain.rs From edd81a4fc8b0b0a2526fd646e527eb62367433d1 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 10 Mar 2019 17:24:32 +0000 Subject: [PATCH 3/6] Unnest the download crate --- Cargo.toml | 4 ++-- {src/download => download}/Cargo.toml | 0 {src/download => download}/src/errors.rs | 0 {src/download => download}/src/lib.rs | 0 {src/download => download}/tests/download-curl-resume.rs | 0 {src/download => download}/tests/download-reqwest-resume.rs | 0 {src/download => download}/tests/support/mod.rs | 0 src/rustup-utils/Cargo.toml | 2 +- 8 files changed, 3 insertions(+), 3 deletions(-) rename {src/download => download}/Cargo.toml (100%) rename {src/download => download}/src/errors.rs (100%) rename {src/download => download}/src/lib.rs (100%) rename {src/download => download}/tests/download-curl-resume.rs (100%) rename {src/download => download}/tests/download-reqwest-resume.rs (100%) rename {src/download => download}/tests/support/mod.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 2e8efb8d5b..58046542e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ no-self-update = [] [dependencies] rustup-dist = { path = "src/rustup-dist" } rustup-utils = { path = "src/rustup-utils" } -download = { path = "src/download" } +download = { path = "download" } clap = "2.18.0" error-chain = "0.12.0" itertools = "0.7.6" @@ -62,7 +62,7 @@ rustup-mock = { path = "src/rustup-mock", version = "1.1.0" } lazy_static = "1.0.0" [workspace] -members = ["src/download"] +members = ["download"] [lib] name = "rustup" diff --git a/src/download/Cargo.toml b/download/Cargo.toml similarity index 100% rename from src/download/Cargo.toml rename to download/Cargo.toml diff --git a/src/download/src/errors.rs b/download/src/errors.rs similarity index 100% rename from src/download/src/errors.rs rename to download/src/errors.rs diff --git a/src/download/src/lib.rs b/download/src/lib.rs similarity index 100% rename from src/download/src/lib.rs rename to download/src/lib.rs diff --git a/src/download/tests/download-curl-resume.rs b/download/tests/download-curl-resume.rs similarity index 100% rename from src/download/tests/download-curl-resume.rs rename to download/tests/download-curl-resume.rs diff --git a/src/download/tests/download-reqwest-resume.rs b/download/tests/download-reqwest-resume.rs similarity index 100% rename from src/download/tests/download-reqwest-resume.rs rename to download/tests/download-reqwest-resume.rs diff --git a/src/download/tests/support/mod.rs b/download/tests/support/mod.rs similarity index 100% rename from src/download/tests/support/mod.rs rename to download/tests/support/mod.rs diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml index 2ed5473298..811ad788f5 100644 --- a/src/rustup-utils/Cargo.toml +++ b/src/rustup-utils/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/rust-lang/rustup.rs" license = "MIT OR Apache-2.0" [dependencies] -download = { path = "../download" } +download = { path = "../../download" } error-chain = "0.12" libc = "0.2.0" rand = "0.5.2" From 432c29ebb53f27e58dac4ff0c7b5a29d0980760c Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 10 Mar 2019 18:38:34 +0000 Subject: [PATCH 4/6] Unnest rustup's dist crate --- Cargo.lock | 26 ++--------- Cargo.toml | 8 +++- appveyor.yml | 1 - build.rs | 5 ++- ci/run.sh | 1 - src/config.rs | 2 +- .../src => dist}/component/components.rs | 8 ++-- .../src => dist}/component/mod.rs | 0 .../src => dist}/component/package.rs | 8 ++-- .../src => dist}/component/transaction.rs | 8 ++-- src/{rustup-dist/src => dist}/config.rs | 2 +- src/{rustup-dist/src => dist}/dist.rs | 16 +++---- src/{rustup-dist/src => dist}/download.rs | 6 +-- src/{rustup-dist/src => dist}/errors.rs | 4 +- src/{rustup-dist/src => dist}/manifest.rs | 4 +- .../src => dist}/manifestation.rs | 20 ++++----- src/{rustup-dist/src/lib.rs => dist/mod.rs} | 6 +-- .../src => dist}/notifications.rs | 6 +-- src/{rustup-dist/src => dist}/prefix.rs | 0 src/{rustup-dist/src => dist}/temp.rs | 0 src/errors.rs | 4 +- src/install.rs | 12 +++--- src/lib.rs | 1 + src/notifications.rs | 8 ++-- src/rustup-cli/download_tracker.rs | 2 +- src/rustup-cli/errors.rs | 4 +- src/rustup-cli/main.rs | 2 +- src/rustup-cli/rustup_mode.rs | 4 +- src/rustup-cli/self_update.rs | 2 +- src/rustup-cli/setup_mode.rs | 2 +- src/rustup-dist/Cargo.toml | 43 ------------------- src/rustup-dist/build.rs | 7 --- src/toolchain.rs | 14 +++--- .../channel-rust-nightly-example.toml | 0 .../channel-rust-nightly-example2.toml | 0 tests/cli-misc.rs | 2 +- tests/cli-v2.rs | 4 +- {src/rustup-dist/tests => tests}/dist.rs | 18 ++++---- .../tests/install.rs => tests/dist_install.rs | 16 +++---- .../manifest.rs => tests/dist_manifest.rs | 6 +-- .../dist_transactions.rs | 12 +++--- 41 files changed, 115 insertions(+), 179 deletions(-) rename src/{rustup-dist/src => dist}/component/components.rs (98%) rename src/{rustup-dist/src => dist}/component/mod.rs (100%) rename src/{rustup-dist/src => dist}/component/package.rs (98%) rename src/{rustup-dist/src => dist}/component/transaction.rs (98%) rename src/{rustup-dist/src => dist}/config.rs (98%) rename src/{rustup-dist/src => dist}/dist.rs (98%) rename src/{rustup-dist/src => dist}/download.rs (98%) rename src/{rustup-dist/src => dist}/errors.rs (98%) rename src/{rustup-dist/src => dist}/manifest.rs (99%) rename src/{rustup-dist/src => dist}/manifestation.rs (98%) rename src/{rustup-dist/src/lib.rs => dist/mod.rs} (67%) rename src/{rustup-dist/src => dist}/notifications.rs (98%) rename src/{rustup-dist/src => dist}/prefix.rs (100%) rename src/{rustup-dist/src => dist}/temp.rs (100%) delete mode 100644 src/rustup-dist/Cargo.toml delete mode 100644 src/rustup-dist/build.rs rename {src/rustup-dist/tests => tests}/channel-rust-nightly-example.toml (100%) rename {src/rustup-dist/tests => tests}/channel-rust-nightly-example2.toml (100%) rename {src/rustup-dist/tests => tests}/dist.rs (99%) rename src/rustup-dist/tests/install.rs => tests/dist_install.rs (97%) rename src/rustup-dist/tests/manifest.rs => tests/dist_manifest.rs (97%) rename src/rustup-dist/tests/transactions.rs => tests/dist_transactions.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index ec54200bef..73136ec40f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1184,49 +1184,29 @@ dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.5.0", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", "markdown 0.2.0 (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.10.19 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-dist 1.17.0", "rustup-mock 1.17.0", "rustup-utils 1.17.0", "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tar 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustup-dist" -version = "1.17.0" -dependencies = [ - "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", - "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-mock 1.17.0", - "rustup-utils 1.17.0", - "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 58046542e8..7892a64be3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,30 +30,34 @@ vendored-openssl = ['openssl/vendored'] no-self-update = [] [dependencies] -rustup-dist = { path = "src/rustup-dist" } rustup-utils = { path = "src/rustup-utils" } download = { path = "download" } clap = "2.18.0" error-chain = "0.12.0" +flate2 = "1.0.1" itertools = "0.7.6" libc = "0.2.0" markdown = "0.2" +ole32-sys = "0.2.0" rand = "0.5.2" regex = "1.0.1" remove_dir_all = "0.5.1" same-file = "1.0" scopeguard = "0.3" sha2 = "0.7.0" +tar = "0.4.0" tempdir = "0.3.4" term = "0.5.1" time = "0.1.34" toml = "0.4" url = "1.1.0" wait-timeout = "0.1.5" +walkdir = "2.0" +xz2 = "0.1.3" openssl = { version = '0.10.15', optional = true } [target."cfg(windows)".dependencies] -winapi = { version = "0.3", features = ["jobapi", "jobapi2", "processthreadsapi", "psapi", "synchapi", "winuser"] } +winapi = { version = "0.3", features = ["handleapi", "jobapi", "jobapi2", "processthreadsapi", "psapi", "synchapi", "sysinfoapi", "tlhelp32", "winnt", "winuser"] } winreg = "0.5.0" gcc = "0.3.50" diff --git a/appveyor.yml b/appveyor.yml index 78b251e2fe..69caa6d88b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -70,7 +70,6 @@ build: false test_script: - cargo build --release --target %TARGET% --locked - - cargo test --release -p rustup-dist --target %TARGET% - cargo test --release --target %TARGET% - cargo fmt --all -- --check diff --git a/build.rs b/build.rs index 07b983a0c5..82aae6fcc8 100644 --- a/build.rs +++ b/build.rs @@ -17,12 +17,15 @@ where } fn main() { - let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap()); + let target = env::var("TARGET").unwrap(); + println!("cargo:rustc-env=TARGET={}", target); + let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap()); File::create(out_dir.join("commit-info.txt")) .unwrap() .write_all(commit_info().as_bytes()) .unwrap(); + println!("cargo:rerun-if-changed=build.rs"); } diff --git a/ci/run.sh b/ci/run.sh index c692a90a69..6dad456fef 100644 --- a/ci/run.sh +++ b/ci/run.sh @@ -12,7 +12,6 @@ cargo build --locked -v --release --target "$TARGET" --features vendored-openssl if [ -z "$SKIP_TESTS" ]; then cargo test --release -p download --target "$TARGET" --features vendored-openssl - cargo test --release -p rustup-dist --target "$TARGET" --features vendored-openssl cargo test --release --target "$TARGET" --features vendored-openssl fi diff --git a/src/config.rs b/src/config.rs index b953e0df16..31aac27dd2 100644 --- a/src/config.rs +++ b/src/config.rs @@ -6,11 +6,11 @@ use std::path::{Path, PathBuf}; use std::process::Command; use std::sync::Arc; +use crate::dist::{dist, temp}; use crate::errors::*; use crate::notifications::*; use crate::settings::{Settings, SettingsFile, DEFAULT_METADATA_VERSION}; use crate::toolchain::{Toolchain, UpdateStatus}; -use rustup_dist::{dist, temp}; use rustup_utils::utils; #[derive(Debug)] diff --git a/src/rustup-dist/src/component/components.rs b/src/dist/component/components.rs similarity index 98% rename from src/rustup-dist/src/component/components.rs rename to src/dist/component/components.rs index 7132012767..b7bc43b16d 100644 --- a/src/rustup-dist/src/component/components.rs +++ b/src/dist/component/components.rs @@ -1,12 +1,12 @@ -use crate::errors::*; -use crate::prefix::InstallPrefix; +use crate::dist::errors::*; +use crate::dist::prefix::InstallPrefix; /// The representation of the installed toolchain and its components. /// `Components` and `DirectoryPackage` are the two sides of the /// installation / uninstallation process. use rustup_utils::utils; -use crate::component::package::{INSTALLER_VERSION, VERSION_FILE}; -use crate::component::transaction::Transaction; +use crate::dist::component::package::{INSTALLER_VERSION, VERSION_FILE}; +use crate::dist::component::transaction::Transaction; use std::fs::File; use std::path::{Path, PathBuf}; diff --git a/src/rustup-dist/src/component/mod.rs b/src/dist/component/mod.rs similarity index 100% rename from src/rustup-dist/src/component/mod.rs rename to src/dist/component/mod.rs diff --git a/src/rustup-dist/src/component/package.rs b/src/dist/component/package.rs similarity index 98% rename from src/rustup-dist/src/component/package.rs rename to src/dist/component/package.rs index 752d069f7c..ab4dd9be44 100644 --- a/src/rustup-dist/src/component/package.rs +++ b/src/dist/component/package.rs @@ -2,11 +2,11 @@ //! for installing from a directory or tarball to an installation //! prefix, represented by a `Components` instance. -use crate::component::components::*; -use crate::component::transaction::*; +use crate::dist::component::components::*; +use crate::dist::component::transaction::*; -use crate::errors::*; -use crate::temp; +use crate::dist::errors::*; +use crate::dist::temp; use rustup_utils::utils; use std::collections::HashSet; diff --git a/src/rustup-dist/src/component/transaction.rs b/src/dist/component/transaction.rs similarity index 98% rename from src/rustup-dist/src/component/transaction.rs rename to src/dist/component/transaction.rs index bf204e2c1f..f29ef2eb7f 100644 --- a/src/rustup-dist/src/component/transaction.rs +++ b/src/dist/component/transaction.rs @@ -9,10 +9,10 @@ //! FIXME: This uses ensure_dir_exists in some places but rollback //! does not remove any dirs created by it. -use crate::errors::*; -use crate::notifications::*; -use crate::prefix::InstallPrefix; -use crate::temp; +use crate::dist::errors::*; +use crate::dist::notifications::*; +use crate::dist::prefix::InstallPrefix; +use crate::dist::temp; use rustup_utils::utils; use std::fs::File; diff --git a/src/rustup-dist/src/config.rs b/src/dist/config.rs similarity index 98% rename from src/rustup-dist/src/config.rs rename to src/dist/config.rs index fb464b5c0c..ebb781184e 100644 --- a/src/rustup-dist/src/config.rs +++ b/src/dist/config.rs @@ -1,5 +1,5 @@ use super::manifest::Component; -use crate::errors::*; +use crate::dist::errors::*; use rustup_utils::toml_utils::*; pub const SUPPORTED_CONFIG_VERSIONS: [&'static str; 1] = ["1"]; diff --git a/src/rustup-dist/src/dist.rs b/src/dist/dist.rs similarity index 98% rename from src/rustup-dist/src/dist.rs rename to src/dist/dist.rs index 7adec48186..0b3df839be 100644 --- a/src/rustup-dist/src/dist.rs +++ b/src/dist/dist.rs @@ -1,11 +1,11 @@ -use crate::download::DownloadCfg; -use crate::errors::*; -use crate::manifest::Component; -use crate::manifest::Manifest as ManifestV2; -use crate::manifestation::{Changes, Manifestation, UpdateStatus}; -use crate::notifications::*; -use crate::prefix::InstallPrefix; -use crate::temp; +use crate::dist::download::DownloadCfg; +use crate::dist::errors::*; +use crate::dist::manifest::Component; +use crate::dist::manifest::Manifest as ManifestV2; +use crate::dist::manifestation::{Changes, Manifestation, UpdateStatus}; +use crate::dist::notifications::*; +use crate::dist::prefix::InstallPrefix; +use crate::dist::temp; use rustup_utils::utils; use std::env; diff --git a/src/rustup-dist/src/download.rs b/src/dist/download.rs similarity index 98% rename from src/rustup-dist/src/download.rs rename to src/dist/download.rs index 3a52bbbb79..763c468c72 100644 --- a/src/rustup-dist/src/download.rs +++ b/src/dist/download.rs @@ -1,6 +1,6 @@ -use crate::errors::*; -use crate::notifications::*; -use crate::temp; +use crate::dist::errors::*; +use crate::dist::notifications::*; +use crate::dist::temp; use rustup_utils::utils; use sha2::{Digest, Sha256}; use url::Url; diff --git a/src/rustup-dist/src/errors.rs b/src/dist/errors.rs similarity index 98% rename from src/rustup-dist/src/errors.rs rename to src/dist/errors.rs index 28ca4a1b5b..f28e5b0128 100644 --- a/src/rustup-dist/src/errors.rs +++ b/src/dist/errors.rs @@ -1,5 +1,5 @@ -use crate::manifest::{Component, Manifest}; -use crate::temp; +use crate::dist::manifest::{Component, Manifest}; +use crate::dist::temp; use error_chain::error_chain; use error_chain::error_chain_processing; use error_chain::{impl_error_chain_kind, impl_error_chain_processed, impl_extract_backtrace}; diff --git a/src/rustup-dist/src/manifest.rs b/src/dist/manifest.rs similarity index 99% rename from src/rustup-dist/src/manifest.rs rename to src/dist/manifest.rs index d8f1effc0f..a60b288071 100644 --- a/src/rustup-dist/src/manifest.rs +++ b/src/dist/manifest.rs @@ -10,10 +10,10 @@ //! //! See tests/channel-rust-nightly-example.toml for an example. -use crate::errors::*; +use crate::dist::errors::*; use rustup_utils::toml_utils::*; -use crate::dist::TargetTriple; +use crate::dist::dist::TargetTriple; use std::collections::HashMap; pub const SUPPORTED_MANIFEST_VERSIONS: [&'static str; 1] = ["2"]; diff --git a/src/rustup-dist/src/manifestation.rs b/src/dist/manifestation.rs similarity index 98% rename from src/rustup-dist/src/manifestation.rs rename to src/dist/manifestation.rs index 2a34b55235..42836e09e8 100644 --- a/src/rustup-dist/src/manifestation.rs +++ b/src/dist/manifestation.rs @@ -1,15 +1,15 @@ //! Maintains a Rust installation by installing individual Rust //! platform components from a distribution server. -use crate::component::{Components, Package, TarGzPackage, TarXzPackage, Transaction}; -use crate::config::Config; -use crate::dist::{TargetTriple, DEFAULT_DIST_SERVER}; -use crate::download::{DownloadCfg, File}; -use crate::errors::*; -use crate::manifest::{Component, Manifest, TargetedPackage}; -use crate::notifications::*; -use crate::prefix::InstallPrefix; -use crate::temp; +use crate::dist::component::{Components, Package, TarGzPackage, TarXzPackage, Transaction}; +use crate::dist::config::Config; +use crate::dist::dist::{TargetTriple, DEFAULT_DIST_SERVER}; +use crate::dist::download::{DownloadCfg, File}; +use crate::dist::errors::*; +use crate::dist::manifest::{Component, Manifest, TargetedPackage}; +use crate::dist::notifications::*; +use crate::dist::prefix::InstallPrefix; +use crate::dist::temp; use rustup_utils::utils; use std::path::Path; @@ -629,7 +629,7 @@ impl Update { .components_to_install .iter() .filter(|c| { - use crate::manifest::*; + use crate::dist::manifest::*; let pkg: Option<&Package> = new_manifest.get_package(&c.short_name_in_manifest()).ok(); let target_pkg: Option<&TargetedPackage> = diff --git a/src/rustup-dist/src/lib.rs b/src/dist/mod.rs similarity index 67% rename from src/rustup-dist/src/lib.rs rename to src/dist/mod.rs index 56917e1c16..8197cb09df 100644 --- a/src/rustup-dist/src/lib.rs +++ b/src/dist/mod.rs @@ -1,7 +1,7 @@ -#![recursion_limit = "1024"] +//! Installation from a Rust distribution server -pub use crate::errors::*; -pub use crate::notifications::Notification; +pub use crate::dist::errors::*; +pub use crate::dist::notifications::Notification; pub mod temp; diff --git a/src/rustup-dist/src/notifications.rs b/src/dist/notifications.rs similarity index 98% rename from src/rustup-dist/src/notifications.rs rename to src/dist/notifications.rs index 90083fee94..f49cf88602 100644 --- a/src/rustup-dist/src/notifications.rs +++ b/src/dist/notifications.rs @@ -1,6 +1,6 @@ -use crate::dist::TargetTriple; -use crate::errors::*; -use crate::temp; +use crate::dist::dist::TargetTriple; +use crate::dist::errors::*; +use crate::dist::temp; use rustup_utils::notify::NotificationLevel; use std::fmt::{self, Display}; use std::path::Path; diff --git a/src/rustup-dist/src/prefix.rs b/src/dist/prefix.rs similarity index 100% rename from src/rustup-dist/src/prefix.rs rename to src/dist/prefix.rs diff --git a/src/rustup-dist/src/temp.rs b/src/dist/temp.rs similarity index 100% rename from src/rustup-dist/src/temp.rs rename to src/dist/temp.rs diff --git a/src/errors.rs b/src/errors.rs index 53e38d0ea4..1467d79f63 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,12 +1,12 @@ use crate::component_for_bin; +use crate::dist::temp; use error_chain::error_chain; use error_chain::error_chain_processing; use error_chain::{impl_error_chain_kind, impl_error_chain_processed, impl_extract_backtrace}; -use rustup_dist::temp; error_chain! { links { - Dist(rustup_dist::Error, rustup_dist::ErrorKind); + Dist(crate::dist::Error, crate::dist::ErrorKind); Utils(rustup_utils::Error, rustup_utils::ErrorKind); } diff --git a/src/install.rs b/src/install.rs index f45aa0057f..c3f4ee9d0f 100644 --- a/src/install.rs +++ b/src/install.rs @@ -1,13 +1,13 @@ //! Installation and upgrade of both distribution-managed and local //! toolchains +use crate::dist::component::{Components, Package, TarGzPackage, Transaction}; +use crate::dist::dist; +use crate::dist::download::DownloadCfg; +use crate::dist::prefix::InstallPrefix; +use crate::dist::temp; +use crate::dist::Notification; use crate::errors::Result; -use rustup_dist::component::{Components, Package, TarGzPackage, Transaction}; -use rustup_dist::dist; -use rustup_dist::download::DownloadCfg; -use rustup_dist::prefix::InstallPrefix; -use rustup_dist::temp; -use rustup_dist::Notification; use rustup_utils::utils; use std::path::Path; diff --git a/src/lib.rs b/src/lib.rs index fa8e388ca2..15232ba601 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -49,6 +49,7 @@ fn component_for_bin(binary: &str) -> Option<&'static str> { pub mod command; mod config; +pub mod dist; pub mod env_var; #[allow(deprecated)] // WORKAROUND https://github.com/rust-lang-nursery/error-chain/issues/254 mod errors; diff --git a/src/notifications.rs b/src/notifications.rs index 0c8da70cb4..41535bbba8 100644 --- a/src/notifications.rs +++ b/src/notifications.rs @@ -3,12 +3,12 @@ use std::path::{Path, PathBuf}; use crate::errors::*; -use rustup_dist::temp; +use crate::dist::temp; use rustup_utils::notify::NotificationLevel; #[derive(Debug)] pub enum Notification<'a> { - Install(rustup_dist::Notification<'a>), + Install(crate::dist::Notification<'a>), Utils(rustup_utils::Notification<'a>), Temp(temp::Notification<'a>), @@ -33,8 +33,8 @@ pub enum Notification<'a> { MissingFileDuringSelfUninstall(PathBuf), } -impl<'a> From> for Notification<'a> { - fn from(n: rustup_dist::Notification<'a>) -> Notification<'a> { +impl<'a> From> for Notification<'a> { + fn from(n: crate::dist::Notification<'a>) -> Notification<'a> { Notification::Install(n) } } diff --git a/src/rustup-cli/download_tracker.rs b/src/rustup-cli/download_tracker.rs index 957a7ab2d4..e5c02fbaea 100644 --- a/src/rustup-cli/download_tracker.rs +++ b/src/rustup-cli/download_tracker.rs @@ -1,5 +1,5 @@ +use rustup::dist::Notification as In; use rustup::Notification; -use rustup_dist::Notification as In; use rustup_utils::tty; use rustup_utils::Notification as Un; use std::collections::VecDeque; diff --git a/src/rustup-cli/errors.rs b/src/rustup-cli/errors.rs index f63046c651..133f3d3ebd 100644 --- a/src/rustup-cli/errors.rs +++ b/src/rustup-cli/errors.rs @@ -6,12 +6,12 @@ use std::path::PathBuf; use error_chain::error_chain; use error_chain::error_chain_processing; use error_chain::{impl_error_chain_kind, impl_error_chain_processed, impl_extract_backtrace}; -use rustup_dist::temp; +use rustup::dist::temp; error_chain! { links { Rustup(rustup::Error, rustup::ErrorKind); - Dist(rustup_dist::Error, rustup_dist::ErrorKind); + Dist(rustup::dist::Error, rustup::dist::ErrorKind); Utils(rustup_utils::Error, rustup_utils::ErrorKind); } diff --git a/src/rustup-cli/main.rs b/src/rustup-cli/main.rs index 4e837ddcd3..af03f042c7 100644 --- a/src/rustup-cli/main.rs +++ b/src/rustup-cli/main.rs @@ -29,8 +29,8 @@ mod setup_mode; mod term2; use crate::errors::*; +use rustup::dist::dist::TargetTriple; use rustup::env_var::RUST_RECURSION_COUNT_MAX; -use rustup_dist::dist::TargetTriple; use std::alloc::System; use std::env; use std::path::PathBuf; diff --git a/src/rustup-cli/rustup_mode.rs b/src/rustup-cli/rustup_mode.rs index 9dc651dd3a..ee4cf57a82 100644 --- a/src/rustup-cli/rustup_mode.rs +++ b/src/rustup-cli/rustup_mode.rs @@ -4,9 +4,9 @@ use crate::help::*; use crate::self_update; use crate::term2; use clap::{App, AppSettings, Arg, ArgGroup, ArgMatches, Shell, SubCommand}; +use rustup::dist::dist::{PartialTargetTriple, PartialToolchainDesc, TargetTriple}; +use rustup::dist::manifest::Component; use rustup::{command, Cfg, Toolchain}; -use rustup_dist::dist::{PartialTargetTriple, PartialToolchainDesc, TargetTriple}; -use rustup_dist::manifest::Component; use rustup_utils::utils::{self, ExitCode}; use std::error::Error; use std::io::{self, Write}; diff --git a/src/rustup-cli/self_update.rs b/src/rustup-cli/self_update.rs index 28437f317c..909dc38f93 100644 --- a/src/rustup-cli/self_update.rs +++ b/src/rustup-cli/self_update.rs @@ -34,8 +34,8 @@ use crate::common::{self, Confirm}; use crate::errors::*; use crate::term2; use regex::Regex; +use rustup::dist::dist; use rustup::{DUP_TOOLS, TOOLS}; -use rustup_dist::dist; use rustup_utils::utils; use same_file::Handle; use std::env; diff --git a/src/rustup-cli/setup_mode.rs b/src/rustup-cli/setup_mode.rs index aba56b8357..77a5f349eb 100644 --- a/src/rustup-cli/setup_mode.rs +++ b/src/rustup-cli/setup_mode.rs @@ -2,7 +2,7 @@ use crate::common; use crate::errors::*; use crate::self_update::{self, InstallOpts}; use clap::{App, AppSettings, Arg}; -use rustup_dist::dist::TargetTriple; +use rustup::dist::dist::TargetTriple; use std::env; pub fn main() -> Result<()> { diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml deleted file mode 100644 index 0a1c81357b..0000000000 --- a/src/rustup-dist/Cargo.toml +++ /dev/null @@ -1,43 +0,0 @@ -[package] - -name = "rustup-dist" -version = "1.17.0" -edition = "2018" -authors = [ "Diggory Blake " ] -description = "Installation from a Rust distribution server" -build = "build.rs" - -documentation = "http://rust-lang.github.io/rustup.rs/rustup_dist/index.html" -homepage = "https://github.com/rust-lang/rustup.rs" -repository = "https://github.com/rust-lang/rustup.rs" - -license = "MIT OR Apache-2.0" - -[dependencies] -regex = "1.0.1" -itertools = "0.7" -ole32-sys = "0.2.0" -url = "1.1.0" -tar = "0.4.0" -flate2 = "1.0.1" -xz2 = "0.1.3" -walkdir = "2.0" -toml = "0.4" -sha2 = "0.7.0" -remove_dir_all = "0.5.1" -rustup-utils = { path = "../rustup-utils" } -error-chain = "0.12" - -[dev-dependencies] -rustup-mock = { path = "../rustup-mock" } -tempdir = "0.3.4" - -[target."cfg(windows)".dependencies] -winapi = { version = "0.3", features = ["handleapi", "sysinfoapi", "tlhelp32", "winnt"] } -winreg = "0.5" - -[target."cfg(not(windows))".dependencies] -libc = "0.2.0" - -[lib] -name = "rustup_dist" diff --git a/src/rustup-dist/build.rs b/src/rustup-dist/build.rs deleted file mode 100644 index 0c8df0193f..0000000000 --- a/src/rustup-dist/build.rs +++ /dev/null @@ -1,7 +0,0 @@ -use std::env; - -fn main() { - let target = env::var("TARGET").unwrap(); - println!("cargo:rustc-env=TARGET={}", target); - println!("cargo:rerun-if-changed=build.rs"); -} diff --git a/src/toolchain.rs b/src/toolchain.rs index f78630550f..cc2e37992c 100644 --- a/src/toolchain.rs +++ b/src/toolchain.rs @@ -1,13 +1,13 @@ use crate::config::Cfg; +use crate::dist::dist::ToolchainDesc; +use crate::dist::download::DownloadCfg; +use crate::dist::manifest::Component; +use crate::dist::manifestation::{Changes, Manifestation}; +use crate::dist::prefix::InstallPrefix; use crate::env_var; use crate::errors::*; use crate::install::{self, InstallMethod}; use crate::notifications::*; -use rustup_dist::dist::ToolchainDesc; -use rustup_dist::download::DownloadCfg; -use rustup_dist::manifest::Component; -use rustup_dist::manifestation::{Changes, Manifestation}; -use rustup_dist::prefix::InstallPrefix; use rustup_utils::utils; use std::env; @@ -24,7 +24,7 @@ pub struct Toolchain<'a> { cfg: &'a Cfg, name: String, path: PathBuf, - dist_handler: Box) + 'a>, + dist_handler: Box) + 'a>, } /// Used by the `list_component` function @@ -191,7 +191,7 @@ impl<'a> Toolchain<'a> { fn ensure_custom(&self) -> Result<()> { if !self.is_custom() { Err( - ErrorKind::Dist(::rustup_dist::ErrorKind::InvalidCustomToolchainName( + ErrorKind::Dist(crate::dist::ErrorKind::InvalidCustomToolchainName( self.name.to_string(), )) .into(), diff --git a/src/rustup-dist/tests/channel-rust-nightly-example.toml b/tests/channel-rust-nightly-example.toml similarity index 100% rename from src/rustup-dist/tests/channel-rust-nightly-example.toml rename to tests/channel-rust-nightly-example.toml diff --git a/src/rustup-dist/tests/channel-rust-nightly-example2.toml b/tests/channel-rust-nightly-example2.toml similarity index 100% rename from src/rustup-dist/tests/channel-rust-nightly-example2.toml rename to tests/channel-rust-nightly-example2.toml diff --git a/tests/cli-misc.rs b/tests/cli-misc.rs index 33c7e5f99c..dc57e0cf66 100644 --- a/tests/cli-misc.rs +++ b/tests/cli-misc.rs @@ -1,7 +1,7 @@ //! Test cases of the rustup command that do not depend on the //! dist server, mostly derived from multirust/test-v2.sh -use rustup_dist::errors::TOOLSTATE_MSG; +use rustup::dist::errors::TOOLSTATE_MSG; use rustup_mock::clitools::{ self, expect_err, expect_ok, expect_ok_ex, expect_stderr_ok, expect_stdout_ok, run, set_current_dist_date, this_host_triple, Config, Scenario, diff --git a/tests/cli-v2.rs b/tests/cli-v2.rs index 3a900b8957..1bc40be2ff 100644 --- a/tests/cli-v2.rs +++ b/tests/cli-v2.rs @@ -8,7 +8,7 @@ use rustup_mock::clitools::{ use std::fs; use tempdir::TempDir; -use rustup_dist::dist::TargetTriple; +use rustup::dist::dist::TargetTriple; macro_rules! for_host { ($s: expr) => { @@ -807,7 +807,7 @@ fn remove_target_missing_update_hash() { } fn make_component_unavailable(config: &Config, name: &str, target: &TargetTriple) { - use rustup_dist::manifest::Manifest; + use rustup::dist::manifest::Manifest; use rustup_mock::dist::create_hash; let ref manifest_path = config.distdir.join("dist/channel-rust-nightly.toml"); diff --git a/src/rustup-dist/tests/dist.rs b/tests/dist.rs similarity index 99% rename from src/rustup-dist/tests/dist.rs rename to tests/dist.rs index 6c0be8204d..eec231f0ab 100644 --- a/src/rustup-dist/tests/dist.rs +++ b/tests/dist.rs @@ -1,15 +1,15 @@ // Tests of installation and updates from a v2 Rust distribution // server (mocked on the file system) -use rustup_dist::dist::{TargetTriple, ToolchainDesc, DEFAULT_DIST_SERVER}; -use rustup_dist::download::DownloadCfg; -use rustup_dist::errors::Result; -use rustup_dist::manifest::{Component, Manifest}; -use rustup_dist::manifestation::{Changes, Manifestation, UpdateStatus}; -use rustup_dist::prefix::InstallPrefix; -use rustup_dist::temp; -use rustup_dist::ErrorKind; -use rustup_dist::Notification; +use rustup::dist::dist::{TargetTriple, ToolchainDesc, DEFAULT_DIST_SERVER}; +use rustup::dist::download::DownloadCfg; +use rustup::dist::errors::Result; +use rustup::dist::manifest::{Component, Manifest}; +use rustup::dist::manifestation::{Changes, Manifestation, UpdateStatus}; +use rustup::dist::prefix::InstallPrefix; +use rustup::dist::temp; +use rustup::dist::ErrorKind; +use rustup::dist::Notification; use rustup_mock::dist::*; use rustup_mock::{MockComponentBuilder, MockFile, MockInstallerBuilder}; use rustup_utils::raw as utils_raw; diff --git a/src/rustup-dist/tests/install.rs b/tests/dist_install.rs similarity index 97% rename from src/rustup-dist/tests/install.rs rename to tests/dist_install.rs index 8fb9caf244..7b84c7ffa3 100644 --- a/src/rustup-dist/tests/install.rs +++ b/tests/dist_install.rs @@ -1,11 +1,11 @@ -use rustup_dist::component::Components; -use rustup_dist::component::Transaction; -use rustup_dist::component::{DirectoryPackage, Package}; -use rustup_dist::dist::DEFAULT_DIST_SERVER; -use rustup_dist::prefix::InstallPrefix; -use rustup_dist::temp; -use rustup_dist::ErrorKind; -use rustup_dist::Notification; +use rustup::dist::component::Components; +use rustup::dist::component::Transaction; +use rustup::dist::component::{DirectoryPackage, Package}; +use rustup::dist::dist::DEFAULT_DIST_SERVER; +use rustup::dist::prefix::InstallPrefix; +use rustup::dist::temp; +use rustup::dist::ErrorKind; +use rustup::dist::Notification; use rustup_mock::{MockComponentBuilder, MockFile, MockInstallerBuilder}; use rustup_utils::utils; use std::fs::File; diff --git a/src/rustup-dist/tests/manifest.rs b/tests/dist_manifest.rs similarity index 97% rename from src/rustup-dist/tests/manifest.rs rename to tests/dist_manifest.rs index 2a84a4c7cb..dabd4890d2 100644 --- a/src/rustup-dist/tests/manifest.rs +++ b/tests/dist_manifest.rs @@ -1,6 +1,6 @@ -use rustup_dist::dist::TargetTriple; -use rustup_dist::manifest::Manifest; -use rustup_dist::ErrorKind; +use rustup::dist::dist::TargetTriple; +use rustup::dist::manifest::Manifest; +use rustup::dist::ErrorKind; // 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/rustup-dist/tests/transactions.rs b/tests/dist_transactions.rs similarity index 99% rename from src/rustup-dist/tests/transactions.rs rename to tests/dist_transactions.rs index dd35167c53..99e67bf5c8 100644 --- a/src/rustup-dist/tests/transactions.rs +++ b/tests/dist_transactions.rs @@ -1,9 +1,9 @@ -use rustup_dist::component::Transaction; -use rustup_dist::dist::DEFAULT_DIST_SERVER; -use rustup_dist::prefix::InstallPrefix; -use rustup_dist::temp; -use rustup_dist::ErrorKind; -use rustup_dist::Notification; +use rustup::dist::component::Transaction; +use rustup::dist::dist::DEFAULT_DIST_SERVER; +use rustup::dist::prefix::InstallPrefix; +use rustup::dist::temp; +use rustup::dist::ErrorKind; +use rustup::dist::Notification; use rustup_utils::raw as utils_raw; use rustup_utils::utils; use std::fs; From 2572d208c193e330a0a9928412ffbbf801f5876f Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 10 Mar 2019 21:50:24 +0000 Subject: [PATCH 5/6] Unnest rustup's utils crate --- Cargo.lock | 40 +------------------ Cargo.toml | 6 +-- src/command.rs | 4 +- src/config.rs | 2 +- src/dist/component/components.rs | 2 +- src/dist/component/package.rs | 2 +- src/dist/component/transaction.rs | 2 +- src/dist/config.rs | 2 +- src/dist/dist.rs | 8 ++-- src/dist/download.rs | 2 +- src/dist/errors.rs | 2 +- src/dist/manifest.rs | 2 +- src/dist/manifestation.rs | 4 +- src/dist/notifications.rs | 8 ++-- src/dist/temp.rs | 4 +- src/errors.rs | 2 +- src/install.rs | 2 +- src/lib.rs | 3 +- src/notifications.rs | 8 ++-- src/rustup-cli/common.rs | 4 +- src/rustup-cli/download_tracker.rs | 4 +- src/rustup-cli/errors.rs | 2 +- src/rustup-cli/main.rs | 2 +- src/rustup-cli/proxy_mode.rs | 2 +- src/rustup-cli/rustup_mode.rs | 2 +- src/rustup-cli/self_update.rs | 4 +- src/rustup-cli/term2.rs | 2 +- src/rustup-mock/Cargo.toml | 26 ------------ src/rustup-utils/Cargo.toml | 31 -------------- src/settings.rs | 2 +- src/toolchain.rs | 2 +- src/{rustup-utils/src => utils}/errors.rs | 0 src/{rustup-utils/src/lib.rs => utils/mod.rs} | 6 +-- .../src => utils}/notifications.rs | 2 +- src/{rustup-utils/src => utils}/notify.rs | 0 src/{rustup-utils/src => utils}/raw.rs | 0 src/{rustup-utils/src => utils}/toml_utils.rs | 2 +- src/{rustup-utils/src => utils}/tty.rs | 0 src/{rustup-utils/src => utils}/utils.rs | 8 ++-- tests/cli-exact.rs | 8 ++-- tests/cli-inst-interactive.rs | 6 ++- tests/cli-misc.rs | 28 +++++++------ tests/cli-rustup.rs | 6 ++- tests/cli-self-upd.rs | 14 ++++--- tests/cli-v1.rs | 10 +++-- tests/cli-v2.rs | 20 +++++----- tests/dist.rs | 10 +++-- tests/dist_install.rs | 6 ++- tests/dist_transactions.rs | 4 +- .../src => tests/mock}/clitools.rs | 4 +- {src/rustup-mock/src => tests/mock}/dist.rs | 4 +- .../src => tests/mock}/mock_bin_src.rs | 0 .../src/lib.rs => tests/mock/mod.rs | 0 53 files changed, 126 insertions(+), 200 deletions(-) delete mode 100644 src/rustup-mock/Cargo.toml delete mode 100644 src/rustup-utils/Cargo.toml rename src/{rustup-utils/src => utils}/errors.rs (100%) rename src/{rustup-utils/src/lib.rs => utils/mod.rs} (64%) rename src/{rustup-utils/src => utils}/notifications.rs (98%) rename src/{rustup-utils/src => utils}/notify.rs (100%) rename src/{rustup-utils/src => utils}/raw.rs (100%) rename src/{rustup-utils/src => utils}/toml_utils.rs (98%) rename src/{rustup-utils/src => utils}/tty.rs (100%) rename src/{rustup-utils/src => utils}/utils.rs (99%) rename {src/rustup-mock/src => tests/mock}/clitools.rs (99%) rename {src/rustup-mock/src => tests/mock}/dist.rs (99%) rename {src/rustup-mock/src => tests/mock}/mock_bin_src.rs (100%) rename src/rustup-mock/src/lib.rs => tests/mock/mod.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 73136ec40f..c49c088502 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,6 +1182,7 @@ name = "rustup" version = "1.17.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.5.0", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1195,10 +1196,9 @@ dependencies = [ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-mock 1.17.0", - "rustup-utils 1.17.0", "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1213,42 +1213,6 @@ dependencies = [ "xz2 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rustup-mock" -version = "1.17.0" -dependencies = [ - "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "xz2 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustup-utils" -version = "1.17.0" -dependencies = [ - "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "download 0.5.0", - "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ryu" version = "0.2.7" diff --git a/Cargo.toml b/Cargo.toml index 7892a64be3..1092e5c5a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ vendored-openssl = ['openssl/vendored'] no-self-update = [] [dependencies] -rustup-utils = { path = "src/rustup-utils" } +dirs = "1.0" download = { path = "download" } clap = "2.18.0" error-chain = "0.12.0" @@ -43,6 +43,7 @@ rand = "0.5.2" regex = "1.0.1" remove_dir_all = "0.5.1" same-file = "1.0" +semver = "0.9.0" scopeguard = "0.3" sha2 = "0.7.0" tar = "0.4.0" @@ -57,12 +58,11 @@ xz2 = "0.1.3" openssl = { version = '0.10.15', optional = true } [target."cfg(windows)".dependencies] -winapi = { version = "0.3", features = ["handleapi", "jobapi", "jobapi2", "processthreadsapi", "psapi", "synchapi", "sysinfoapi", "tlhelp32", "winnt", "winuser"] } +winapi = { version = "0.3", features = ["combaseapi", "errhandlingapi", "fileapi", "handleapi", "ioapiset", "jobapi", "jobapi2", "minwindef", "processthreadsapi", "psapi", "shlobj", "shtypes", "synchapi", "sysinfoapi", "tlhelp32", "userenv", "winbase", "winerror", "winioctl", "winnt", "winuser"] } winreg = "0.5.0" gcc = "0.3.50" [dev-dependencies] -rustup-mock = { path = "src/rustup-mock", version = "1.1.0" } lazy_static = "1.0.0" [workspace] diff --git a/src/command.rs b/src/command.rs index 88017761e1..6d101aed90 100644 --- a/src/command.rs +++ b/src/command.rs @@ -3,7 +3,7 @@ use std::io; use std::process::{self, Command}; use crate::errors::*; -use rustup_utils::utils::ExitCode; +use crate::utils::utils::ExitCode; pub fn run_command_for_dir>( mut cmd: Command, @@ -16,7 +16,7 @@ pub fn run_command_for_dir>( // when and why this is needed. cmd.stdin(process::Stdio::inherit()); - return exec(&mut cmd).chain_err(|| rustup_utils::ErrorKind::RunningCommand { + return exec(&mut cmd).chain_err(|| crate::utils::ErrorKind::RunningCommand { name: OsStr::new(arg0).to_owned(), }); diff --git a/src/config.rs b/src/config.rs index 31aac27dd2..c3d5a61a15 100644 --- a/src/config.rs +++ b/src/config.rs @@ -11,7 +11,7 @@ use crate::errors::*; use crate::notifications::*; use crate::settings::{Settings, SettingsFile, DEFAULT_METADATA_VERSION}; use crate::toolchain::{Toolchain, UpdateStatus}; -use rustup_utils::utils; +use crate::utils::utils; #[derive(Debug)] pub enum OverrideReason { diff --git a/src/dist/component/components.rs b/src/dist/component/components.rs index b7bc43b16d..67edba30aa 100644 --- a/src/dist/component/components.rs +++ b/src/dist/component/components.rs @@ -3,7 +3,7 @@ use crate::dist::prefix::InstallPrefix; /// The representation of the installed toolchain and its components. /// `Components` and `DirectoryPackage` are the two sides of the /// installation / uninstallation process. -use rustup_utils::utils; +use crate::utils::utils; use crate::dist::component::package::{INSTALLER_VERSION, VERSION_FILE}; use crate::dist::component::transaction::Transaction; diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs index ab4dd9be44..bf6e8da358 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs @@ -7,7 +7,7 @@ use crate::dist::component::transaction::*; use crate::dist::errors::*; use crate::dist::temp; -use rustup_utils::utils; +use crate::utils::utils; use std::collections::HashSet; use std::fmt; diff --git a/src/dist/component/transaction.rs b/src/dist/component/transaction.rs index f29ef2eb7f..d790da1807 100644 --- a/src/dist/component/transaction.rs +++ b/src/dist/component/transaction.rs @@ -13,7 +13,7 @@ use crate::dist::errors::*; use crate::dist::notifications::*; use crate::dist::prefix::InstallPrefix; use crate::dist::temp; -use rustup_utils::utils; +use crate::utils::utils; use std::fs::File; use std::path::{Path, PathBuf}; diff --git a/src/dist/config.rs b/src/dist/config.rs index ebb781184e..b8431a1aea 100644 --- a/src/dist/config.rs +++ b/src/dist/config.rs @@ -1,6 +1,6 @@ use super::manifest::Component; use crate::dist::errors::*; -use rustup_utils::toml_utils::*; +use crate::utils::toml_utils::*; pub const SUPPORTED_CONFIG_VERSIONS: [&'static str; 1] = ["1"]; pub const DEFAULT_CONFIG_VERSION: &'static str = "1"; diff --git a/src/dist/dist.rs b/src/dist/dist.rs index 0b3df839be..3cc5d5a8fe 100644 --- a/src/dist/dist.rs +++ b/src/dist/dist.rs @@ -6,7 +6,7 @@ use crate::dist::manifestation::{Changes, Manifestation, UpdateStatus}; use crate::dist::notifications::*; use crate::dist::prefix::InstallPrefix; use crate::dist::temp; -use rustup_utils::utils; +use crate::utils::utils; use std::env; use std::fmt; @@ -563,7 +563,7 @@ pub fn update_from_dist_<'a>( }; } Ok(None) => return Ok(None), - Err(Error(ErrorKind::Utils(::rustup_utils::ErrorKind::DownloadNotExists { .. }), _)) => { + Err(Error(ErrorKind::Utils(crate::utils::ErrorKind::DownloadNotExists { .. }), _)) => { // Proceed to try v1 as a fallback (download.notify_handler)(Notification::DownloadingLegacyManifest); } @@ -574,7 +574,7 @@ pub fn update_from_dist_<'a>( // If the v2 manifest is not found then try v1 let manifest = match dl_v1_manifest(download, toolchain) { Ok(m) => m, - Err(Error(ErrorKind::Utils(rustup_utils::ErrorKind::DownloadNotExists { .. }), _)) => { + Err(Error(ErrorKind::Utils(crate::utils::ErrorKind::DownloadNotExists { .. }), _)) => { return Err(format!("no release found for '{}'", toolchain.manifest_name()).into()); } Err(e @ Error(ErrorKind::ChecksumFailed { .. }, _)) => { @@ -597,7 +597,7 @@ pub fn update_from_dist_<'a>( ) { Ok(None) => Ok(None), Ok(Some(hash)) => Ok(Some(hash)), - e @ Err(Error(ErrorKind::Utils(rustup_utils::ErrorKind::DownloadNotExists { .. }), _)) => e + e @ Err(Error(ErrorKind::Utils(crate::utils::ErrorKind::DownloadNotExists { .. }), _)) => e .chain_err(|| { format!( "could not download nonexistent rust version `{}`", diff --git a/src/dist/download.rs b/src/dist/download.rs index 763c468c72..6b6daf5664 100644 --- a/src/dist/download.rs +++ b/src/dist/download.rs @@ -1,7 +1,7 @@ use crate::dist::errors::*; use crate::dist::notifications::*; use crate::dist::temp; -use rustup_utils::utils; +use crate::utils::utils; use sha2::{Digest, Sha256}; use url::Url; diff --git a/src/dist/errors.rs b/src/dist/errors.rs index f28e5b0128..db36fecac7 100644 --- a/src/dist/errors.rs +++ b/src/dist/errors.rs @@ -13,7 +13,7 @@ pub const TOOLSTATE_MSG: &str = error_chain! { links { - Utils(rustup_utils::Error, rustup_utils::ErrorKind); + Utils(crate::utils::Error, crate::utils::ErrorKind); } foreign_links { diff --git a/src/dist/manifest.rs b/src/dist/manifest.rs index a60b288071..ac11ed9509 100644 --- a/src/dist/manifest.rs +++ b/src/dist/manifest.rs @@ -11,7 +11,7 @@ //! See tests/channel-rust-nightly-example.toml for an example. use crate::dist::errors::*; -use rustup_utils::toml_utils::*; +use crate::utils::toml_utils::*; use crate::dist::dist::TargetTriple; use std::collections::HashMap; diff --git a/src/dist/manifestation.rs b/src/dist/manifestation.rs index 42836e09e8..4f15e46e16 100644 --- a/src/dist/manifestation.rs +++ b/src/dist/manifestation.rs @@ -10,7 +10,7 @@ use crate::dist::manifest::{Component, Manifest, TargetedPackage}; use crate::dist::notifications::*; use crate::dist::prefix::InstallPrefix; use crate::dist::temp; -use rustup_utils::utils; +use crate::utils::utils; use std::path::Path; pub const DIST_MANIFEST: &'static str = "multirust-channel-manifest.toml"; @@ -206,7 +206,7 @@ impl Manifestation { let gz; let xz; - let notification_converter = |notification: rustup_utils::Notification<'_>| { + let notification_converter = |notification: crate::utils::Notification<'_>| { notify_handler(Notification::Utils(notification)); }; let reader = diff --git a/src/dist/notifications.rs b/src/dist/notifications.rs index f49cf88602..3e74ec88b8 100644 --- a/src/dist/notifications.rs +++ b/src/dist/notifications.rs @@ -1,13 +1,13 @@ use crate::dist::dist::TargetTriple; use crate::dist::errors::*; use crate::dist::temp; -use rustup_utils::notify::NotificationLevel; +use crate::utils::notify::NotificationLevel; use std::fmt::{self, Display}; use std::path::Path; #[derive(Debug)] pub enum Notification<'a> { - Utils(rustup_utils::Notification<'a>), + Utils(crate::utils::Notification<'a>), Temp(temp::Notification<'a>), Extracting(&'a Path, &'a Path), @@ -33,8 +33,8 @@ pub enum Notification<'a> { ComponentUnavailable(&'a str, Option<&'a TargetTriple>), } -impl<'a> From> for Notification<'a> { - fn from(n: rustup_utils::Notification<'a>) -> Notification<'a> { +impl<'a> From> for Notification<'a> { + fn from(n: crate::utils::Notification<'a>) -> Notification<'a> { Notification::Utils(n) } } diff --git a/src/dist/temp.rs b/src/dist/temp.rs index 75a0a39b4a..bea1ed93e2 100644 --- a/src/dist/temp.rs +++ b/src/dist/temp.rs @@ -1,4 +1,4 @@ -use rustup_utils::raw; +use crate::utils::raw; use std::error; use std::fmt::{self, Display}; use std::fs; @@ -6,7 +6,7 @@ use std::io; use std::ops; use std::path::{Path, PathBuf}; -use rustup_utils::notify::NotificationLevel; +use crate::utils::notify::NotificationLevel; #[derive(Debug)] pub enum Error { diff --git a/src/errors.rs b/src/errors.rs index 1467d79f63..b91b24387b 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -7,7 +7,7 @@ use error_chain::{impl_error_chain_kind, impl_error_chain_processed, impl_extrac error_chain! { links { Dist(crate::dist::Error, crate::dist::ErrorKind); - Utils(rustup_utils::Error, rustup_utils::ErrorKind); + Utils(crate::utils::Error, crate::utils::ErrorKind); } foreign_links { diff --git a/src/install.rs b/src/install.rs index c3f4ee9d0f..f4f9cf1152 100644 --- a/src/install.rs +++ b/src/install.rs @@ -8,7 +8,7 @@ use crate::dist::prefix::InstallPrefix; use crate::dist::temp; use crate::dist::Notification; use crate::errors::Result; -use rustup_utils::utils; +use crate::utils::utils; use std::path::Path; #[derive(Copy, Clone)] diff --git a/src/lib.rs b/src/lib.rs index 15232ba601..ef24bb09c8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,7 @@ pub use crate::config::*; pub use crate::errors::*; pub use crate::notifications::*; pub use crate::toolchain::*; -pub use rustup_utils::{notify, toml_utils, utils}; +pub use crate::utils::{notify, toml_utils}; // A list of all binaries which Rustup will proxy. pub static TOOLS: &'static [&'static str] = &[ @@ -57,3 +57,4 @@ mod install; mod notifications; pub mod settings; mod toolchain; +pub mod utils; diff --git a/src/notifications.rs b/src/notifications.rs index 41535bbba8..21b03ad086 100644 --- a/src/notifications.rs +++ b/src/notifications.rs @@ -4,12 +4,12 @@ use std::path::{Path, PathBuf}; use crate::errors::*; use crate::dist::temp; -use rustup_utils::notify::NotificationLevel; +use crate::utils::notify::NotificationLevel; #[derive(Debug)] pub enum Notification<'a> { Install(crate::dist::Notification<'a>), - Utils(rustup_utils::Notification<'a>), + Utils(crate::utils::Notification<'a>), Temp(temp::Notification<'a>), SetDefaultToolchain(&'a str), @@ -38,8 +38,8 @@ impl<'a> From> for Notification<'a> { Notification::Install(n) } } -impl<'a> From> for Notification<'a> { - fn from(n: rustup_utils::Notification<'a>) -> Notification<'a> { +impl<'a> From> for Notification<'a> { + fn from(n: crate::utils::Notification<'a>) -> Notification<'a> { Notification::Utils(n) } } diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs index d4ee5d038c..de0183d902 100644 --- a/src/rustup-cli/common.rs +++ b/src/rustup-cli/common.rs @@ -3,9 +3,9 @@ use crate::errors::*; use crate::self_update; use crate::term2; +use rustup::utils::notify::NotificationLevel; +use rustup::utils::utils; use rustup::{Cfg, Notification, Toolchain, UpdateStatus}; -use rustup_utils::notify::NotificationLevel; -use rustup_utils::utils; use std::io::{BufRead, BufReader, Write}; use std::path::Path; use std::process::{Command, Stdio}; diff --git a/src/rustup-cli/download_tracker.rs b/src/rustup-cli/download_tracker.rs index e5c02fbaea..baf8811734 100644 --- a/src/rustup-cli/download_tracker.rs +++ b/src/rustup-cli/download_tracker.rs @@ -1,7 +1,7 @@ use rustup::dist::Notification as In; +use rustup::utils::tty; +use rustup::utils::Notification as Un; use rustup::Notification; -use rustup_utils::tty; -use rustup_utils::Notification as Un; use std::collections::VecDeque; use std::fmt; use time::precise_time_s; diff --git a/src/rustup-cli/errors.rs b/src/rustup-cli/errors.rs index 133f3d3ebd..ee1d29b327 100644 --- a/src/rustup-cli/errors.rs +++ b/src/rustup-cli/errors.rs @@ -12,7 +12,7 @@ error_chain! { links { Rustup(rustup::Error, rustup::ErrorKind); Dist(rustup::dist::Error, rustup::dist::ErrorKind); - Utils(rustup_utils::Error, rustup_utils::ErrorKind); + Utils(rustup::utils::Error, rustup::utils::ErrorKind); } foreign_links { diff --git a/src/rustup-cli/main.rs b/src/rustup-cli/main.rs index af03f042c7..baf8f586fa 100644 --- a/src/rustup-cli/main.rs +++ b/src/rustup-cli/main.rs @@ -172,7 +172,7 @@ fn fix_windows_reg_key() {} // rustup used to be called 'multirust'. This deletes the old bin. fn delete_multirust_bin() { - use rustup_utils::utils; + use rustup::utils::utils; use std::env::consts::EXE_SUFFIX; use std::fs; diff --git a/src/rustup-cli/proxy_mode.rs b/src/rustup-cli/proxy_mode.rs index 9f26338cbb..4b21e760f6 100644 --- a/src/rustup-cli/proxy_mode.rs +++ b/src/rustup-cli/proxy_mode.rs @@ -2,8 +2,8 @@ use crate::common::set_globals; use crate::errors::*; use crate::job; use rustup::command::run_command_for_dir; +use rustup::utils::utils::{self, ExitCode}; use rustup::Cfg; -use rustup_utils::utils::{self, ExitCode}; use std::env; use std::ffi::OsString; use std::path::PathBuf; diff --git a/src/rustup-cli/rustup_mode.rs b/src/rustup-cli/rustup_mode.rs index ee4cf57a82..aa9d4fa48b 100644 --- a/src/rustup-cli/rustup_mode.rs +++ b/src/rustup-cli/rustup_mode.rs @@ -6,8 +6,8 @@ use crate::term2; use clap::{App, AppSettings, Arg, ArgGroup, ArgMatches, Shell, SubCommand}; use rustup::dist::dist::{PartialTargetTriple, PartialToolchainDesc, TargetTriple}; use rustup::dist::manifest::Component; +use rustup::utils::utils::{self, ExitCode}; use rustup::{command, Cfg, Toolchain}; -use rustup_utils::utils::{self, ExitCode}; use std::error::Error; use std::io::{self, Write}; use std::iter; diff --git a/src/rustup-cli/self_update.rs b/src/rustup-cli/self_update.rs index 909dc38f93..af87a29458 100644 --- a/src/rustup-cli/self_update.rs +++ b/src/rustup-cli/self_update.rs @@ -35,8 +35,8 @@ use crate::errors::*; use crate::term2; use regex::Regex; use rustup::dist::dist; +use rustup::utils::utils; use rustup::{DUP_TOOLS, TOOLS}; -use rustup_utils::utils; use same_file::Handle; use std::env; use std::env::consts::EXE_SUFFIX; @@ -689,7 +689,7 @@ fn cleanup_legacy() -> Result<()> { #[cfg(windows)] fn legacy_multirust_home_dir() -> Result { - use rustup_utils::raw::windows::{get_special_folder, FOLDERID_LocalAppData}; + use rustup::utils::raw::windows::{get_special_folder, FOLDERID_LocalAppData}; // FIXME: This looks bogus. Where is the .multirust dir? Ok(get_special_folder(&FOLDERID_LocalAppData).unwrap_or(PathBuf::from("."))) diff --git a/src/rustup-cli/term2.rs b/src/rustup-cli/term2.rs index 15a7fccf44..3e63844563 100644 --- a/src/rustup-cli/term2.rs +++ b/src/rustup-cli/term2.rs @@ -4,7 +4,7 @@ use markdown::tokenize; use markdown::{Block, ListItem, Span}; -use rustup_utils::tty; +use rustup::utils::tty; use std::io; pub use term::color; diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml deleted file mode 100644 index f3302a12fa..0000000000 --- a/src/rustup-mock/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] - -name = "rustup-mock" -version = "1.17.0" -edition = "2018" -authors = [ "Diggory Blake " ] -description = "Test mocks for rustup" - -documentation = "http://rust-lang.github.io/rustup.rs/rustup_mock/index.html" -homepage = "https://github.com/rust-lang/rustup.rs" -repository = "https://github.com/rust-lang/rustup.rs" - -[dependencies] -url = "1.1.0" -lazy_static = "1.0.0" -walkdir = "2.0.0" -flate2 = "1.0.1" -xz2 = "0.1.3" -tempdir = "0.3.4" -tar = "0.4.0" -toml = "0.4" -sha2 = "0.7.0" - -[target."cfg(windows)".dependencies] -winapi = "0.3" -winreg = "0.5.0" diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml deleted file mode 100644 index 811ad788f5..0000000000 --- a/src/rustup-utils/Cargo.toml +++ /dev/null @@ -1,31 +0,0 @@ -[package] - -name = "rustup-utils" -version = "1.17.0" -edition = "2018" -authors = [ "Diggory Blake " ] -description = "Utility functions for rustup" - -documentation = "http://rust-lang.github.io/rustup.rs/rustup_utils/index.html" -homepage = "https://github.com/rust-lang/rustup.rs" -repository = "https://github.com/rust-lang/rustup.rs" - -license = "MIT OR Apache-2.0" - -[dependencies] -download = { path = "../../download" } -error-chain = "0.12" -libc = "0.2.0" -rand = "0.5.2" -remove_dir_all = "0.5.1" -scopeguard = "0.3.0" -semver = "0.9.0" -sha2 = "0.7.0" -toml = "0.4" -url = "1.1" -dirs = "1.0" - -[target."cfg(windows)".dependencies] -winapi = { version = "0.3", features = ["combaseapi", "errhandlingapi", "fileapi", "handleapi", - "ioapiset", "minwindef", "processthreadsapi", "shlobj", "shtypes", "userenv", "winbase", "winerror", "winnt", "winioctl"] } -winreg = "0.5.0" diff --git a/src/settings.rs b/src/settings.rs index 8ffce9f71e..b6f8299d3b 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -1,7 +1,7 @@ use crate::errors::*; use crate::notifications::*; use crate::toml_utils::*; -use crate::utils; +use crate::utils::utils; use std::cell::RefCell; use std::collections::BTreeMap; use std::path::{Path, PathBuf}; diff --git a/src/toolchain.rs b/src/toolchain.rs index cc2e37992c..6f64995c33 100644 --- a/src/toolchain.rs +++ b/src/toolchain.rs @@ -8,7 +8,7 @@ use crate::env_var; use crate::errors::*; use crate::install::{self, InstallMethod}; use crate::notifications::*; -use rustup_utils::utils; +use crate::utils::utils; use std::env; use std::env::consts::EXE_SUFFIX; diff --git a/src/rustup-utils/src/errors.rs b/src/utils/errors.rs similarity index 100% rename from src/rustup-utils/src/errors.rs rename to src/utils/errors.rs diff --git a/src/rustup-utils/src/lib.rs b/src/utils/mod.rs similarity index 64% rename from src/rustup-utils/src/lib.rs rename to src/utils/mod.rs index ab9ab8f27c..2ab63ad3ff 100644 --- a/src/rustup-utils/src/lib.rs +++ b/src/utils/mod.rs @@ -1,4 +1,4 @@ -#![recursion_limit = "1024"] // for error_chain! +///! Utility functions for rustup #[allow(deprecated)] // WORKAROUND https://github.com/rust-lang-nursery/error-chain/issues/254 pub mod errors; @@ -8,6 +8,6 @@ pub mod toml_utils; pub mod tty; pub mod utils; -pub use crate::errors::*; -pub use crate::notifications::Notification; +pub use crate::utils::errors::*; +pub use crate::utils::notifications::Notification; pub mod notify; diff --git a/src/rustup-utils/src/notifications.rs b/src/utils/notifications.rs similarity index 98% rename from src/rustup-utils/src/notifications.rs rename to src/utils/notifications.rs index 9b978db251..9775cab803 100644 --- a/src/rustup-utils/src/notifications.rs +++ b/src/utils/notifications.rs @@ -3,7 +3,7 @@ use std::path::Path; use url::Url; -use crate::notify::NotificationLevel; +use crate::utils::notify::NotificationLevel; #[derive(Debug)] pub enum Notification<'a> { diff --git a/src/rustup-utils/src/notify.rs b/src/utils/notify.rs similarity index 100% rename from src/rustup-utils/src/notify.rs rename to src/utils/notify.rs diff --git a/src/rustup-utils/src/raw.rs b/src/utils/raw.rs similarity index 100% rename from src/rustup-utils/src/raw.rs rename to src/utils/raw.rs diff --git a/src/rustup-utils/src/toml_utils.rs b/src/utils/toml_utils.rs similarity index 98% rename from src/rustup-utils/src/toml_utils.rs rename to src/utils/toml_utils.rs index a1f111f264..72b6fb9cf7 100644 --- a/src/rustup-utils/src/toml_utils.rs +++ b/src/utils/toml_utils.rs @@ -1,4 +1,4 @@ -use crate::errors::*; +use crate::utils::errors::*; pub fn get_value(table: &mut toml::value::Table, key: &str, path: &str) -> Result { table diff --git a/src/rustup-utils/src/tty.rs b/src/utils/tty.rs similarity index 100% rename from src/rustup-utils/src/tty.rs rename to src/utils/tty.rs diff --git a/src/rustup-utils/src/utils.rs b/src/utils/utils.rs similarity index 99% rename from src/rustup-utils/src/utils.rs rename to src/utils/utils.rs index b7d5f3a998..691b47d348 100644 --- a/src/rustup-utils/src/utils.rs +++ b/src/utils/utils.rs @@ -1,6 +1,6 @@ -use crate::errors::*; -use crate::notifications::Notification; -use crate::raw; +use crate::utils::errors::*; +use crate::utils::notifications::Notification; +use crate::utils::raw; use sha2::Sha256; use std::cmp::Ord; use std::env; @@ -14,7 +14,7 @@ use url::Url; #[cfg(windows)] use winapi::shared::minwindef::DWORD; -pub use crate::raw::{ +pub use crate::utils::utils::raw::{ find_cmd, has_cmd, if_not_empty, is_directory, is_file, path_exists, prefix_arg, random_string, }; diff --git a/tests/cli-exact.rs b/tests/cli-exact.rs index 3df160dfe7..ea0818f482 100644 --- a/tests/cli-exact.rs +++ b/tests/cli-exact.rs @@ -1,7 +1,9 @@ //! Yet more cli test cases. These are testing that the output //! is exactly as expected. -use rustup_mock::clitools::{ +pub mod mock; + +use crate::mock::clitools::{ self, expect_err_ex, expect_ok, expect_ok_ex, this_host_triple, Config, Scenario, }; @@ -227,7 +229,7 @@ fn remove_override_nonexistent() { path }; // FIXME TempDir seems to succumb to difficulties removing dirs on windows - let _ = rustup_utils::raw::remove_dir(&path); + let _ = rustup::utils::raw::remove_dir(&path); assert!(!path.exists()); expect_ok_ex( config, @@ -280,7 +282,7 @@ fn list_overrides_with_nonexistent() { std::fs::canonicalize(dir.path()).unwrap() }; // FIXME TempDir seems to succumb to difficulties removing dirs on windows - let _ = rustup_utils::raw::remove_dir(&nonexistent_path); + let _ = rustup::utils::raw::remove_dir(&nonexistent_path); assert!(!nonexistent_path.exists()); let mut path_formatted = format!("{}", nonexistent_path.display()).to_string(); diff --git a/tests/cli-inst-interactive.rs b/tests/cli-inst-interactive.rs index a6a3403787..084ebfad89 100644 --- a/tests/cli-inst-interactive.rs +++ b/tests/cli-inst-interactive.rs @@ -1,8 +1,10 @@ //! Tests of the interactive console installer +pub mod mock; + +use crate::mock::clitools::{self, expect_stdout_ok, Config, SanitizedOutput, Scenario}; +use crate::mock::{get_path, restore_path}; use lazy_static::lazy_static; -use rustup_mock::clitools::{self, expect_stdout_ok, Config, SanitizedOutput, Scenario}; -use rustup_mock::{get_path, restore_path}; use std::io::Write; use std::process::Stdio; use std::sync::Mutex; diff --git a/tests/cli-misc.rs b/tests/cli-misc.rs index dc57e0cf66..d28df66c9d 100644 --- a/tests/cli-misc.rs +++ b/tests/cli-misc.rs @@ -1,12 +1,14 @@ //! Test cases of the rustup command that do not depend on the //! dist server, mostly derived from multirust/test-v2.sh -use rustup::dist::errors::TOOLSTATE_MSG; -use rustup_mock::clitools::{ +pub mod mock; + +use crate::mock::clitools::{ self, expect_err, expect_ok, expect_ok_ex, expect_stderr_ok, expect_stdout_ok, run, set_current_dist_date, this_host_triple, Config, Scenario, }; -use rustup_utils::{raw, utils}; +use rustup::dist::errors::TOOLSTATE_MSG; +use rustup::utils::{raw, utils}; use std::env::consts::EXE_SUFFIX; use tempdir::TempDir; @@ -95,7 +97,7 @@ fn running_with_v2_metadata() { setup(&|config| { expect_ok(config, &["rustup", "default", "nightly"]); // Replace the metadata version - rustup_utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); + rustup::utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); expect_err( config, &["rustup", "default", "nightly"], @@ -117,7 +119,7 @@ fn upgrade_v2_metadata_to_v12() { setup(&|config| { expect_ok(config, &["rustup", "default", "nightly"]); // Replace the metadata version - rustup_utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); + 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"); expect_err( @@ -134,9 +136,9 @@ fn upgrade_v2_metadata_to_v12() { #[test] fn upgrade_toml_settings() { setup(&|config| { - rustup_utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); - rustup_utils::raw::write_file(&config.rustupdir.join("default"), "beta").unwrap(); - rustup_utils::raw::write_file(&config.rustupdir.join("overrides"), "a;nightly\nb;stable") + rustup::utils::raw::write_file(&config.rustupdir.join("version"), "2").unwrap(); + rustup::utils::raw::write_file(&config.rustupdir.join("default"), "beta").unwrap(); + rustup::utils::raw::write_file(&config.rustupdir.join("overrides"), "a;nightly\nb;stable") .unwrap(); expect_err( config, @@ -144,21 +146,21 @@ fn upgrade_toml_settings() { "rustup's metadata is out of date. run `rustup self upgrade-data`", ); // Replace the metadata version - assert!(!rustup_utils::raw::is_file( + assert!(!rustup::utils::raw::is_file( &config.rustupdir.join("version") )); - assert!(!rustup_utils::raw::is_file( + assert!(!rustup::utils::raw::is_file( &config.rustupdir.join("default") )); - assert!(!rustup_utils::raw::is_file( + assert!(!rustup::utils::raw::is_file( &config.rustupdir.join("overrides") )); - assert!(rustup_utils::raw::is_file( + assert!(rustup::utils::raw::is_file( &config.rustupdir.join("settings.toml") )); let content = - rustup_utils::raw::read_file(&config.rustupdir.join("settings.toml")).unwrap(); + rustup::utils::raw::read_file(&config.rustupdir.join("settings.toml")).unwrap(); assert!(content.contains("version = \"2\"")); assert!(content.contains("[overrides]")); assert!(content.contains("a = \"nightly")); diff --git a/tests/cli-rustup.rs b/tests/cli-rustup.rs index 7a13a39a8f..0b5dd31fc9 100644 --- a/tests/cli-rustup.rs +++ b/tests/cli-rustup.rs @@ -1,10 +1,12 @@ //! Test cases for new rustup UI -use rustup_mock::clitools::{ +pub mod mock; + +use crate::mock::clitools::{ self, expect_err, expect_ok, expect_ok_ex, expect_stderr_ok, expect_stdout_ok, run, set_current_dist_date, this_host_triple, Config, Scenario, }; -use rustup_utils::raw; +use rustup::utils::raw; use std::env::consts::EXE_SUFFIX; use std::fs; use std::path::MAIN_SEPARATOR; diff --git a/tests/cli-self-upd.rs b/tests/cli-self-upd.rs index 8b144ed115..255d93f351 100644 --- a/tests/cli-self-upd.rs +++ b/tests/cli-self-upd.rs @@ -1,14 +1,16 @@ //! Testing self install, uninstall and update -use lazy_static::lazy_static; -use remove_dir_all::remove_dir_all; -use rustup_mock::clitools::{ +pub mod mock; + +use crate::mock::clitools::{ self, expect_err, expect_err_ex, expect_ok, expect_ok_contains, expect_ok_ex, expect_stderr_ok, expect_stdout_ok, this_host_triple, Config, Scenario, }; -use rustup_mock::dist::calc_hash; -use rustup_mock::{get_path, restore_path}; -use rustup_utils::{raw, utils}; +use crate::mock::dist::calc_hash; +use crate::mock::{get_path, restore_path}; +use lazy_static::lazy_static; +use remove_dir_all::remove_dir_all; +use rustup::utils::{raw, utils}; use std::env; use std::env::consts::EXE_SUFFIX; use std::fs; diff --git a/tests/cli-v1.rs b/tests/cli-v1.rs index 03592ea4dc..ced752a9ee 100644 --- a/tests/cli-v1.rs +++ b/tests/cli-v1.rs @@ -1,7 +1,9 @@ //! Test cases of the rustup command, using v1 manifests, mostly //! derived from multirust/test-v2.sh -use rustup_mock::clitools::{ +pub mod mock; + +use crate::mock::clitools::{ self, expect_err, expect_ok, expect_stderr_ok, expect_stdout_ok, set_current_dist_date, this_host_triple, Config, Scenario, }; @@ -161,11 +163,11 @@ fn remove_override_toolchain_err_handling() { fn bad_sha_on_manifest() { setup(&|config| { let sha_file = config.distdir.join("dist/channel-rust-nightly.sha256"); - let sha_str = rustup_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(); sha_bytes[..10].clone_from_slice(b"aaaaaaaaaa"); let sha_str = String::from_utf8(sha_bytes).unwrap(); - rustup_utils::raw::write_file(&sha_file, &sha_str).unwrap(); + rustup::utils::raw::write_file(&sha_file, &sha_str).unwrap(); expect_err(config, &["rustup", "default", "nightly"], "checksum failed"); }); } @@ -179,7 +181,7 @@ fn bad_sha_on_installer() { let path = file.path(); let filename = path.to_string_lossy(); if filename.ends_with(".tar.gz") || filename.ends_with(".tar.xz") { - rustup_utils::raw::write_file(&path, "xxx").unwrap(); + rustup::utils::raw::write_file(&path, "xxx").unwrap(); } } expect_err(config, &["rustup", "default", "nightly"], "checksum failed"); diff --git a/tests/cli-v2.rs b/tests/cli-v2.rs index 1bc40be2ff..84223df520 100644 --- a/tests/cli-v2.rs +++ b/tests/cli-v2.rs @@ -1,7 +1,9 @@ //! Test cases of the rustup command, using v2 manifests, mostly //! derived from multirust/test-v2.sh -use rustup_mock::clitools::{ +pub mod mock; + +use crate::mock::clitools::{ self, expect_err, expect_not_stdout_ok, expect_ok, expect_stderr_ok, expect_stdout_ok, set_current_dist_date, this_host_triple, Config, Scenario, }; @@ -112,7 +114,7 @@ fn list_toolchains_with_bogus_file() { let name = "bogus_regular_file.txt"; let path = config.rustupdir.join("toolchains").join(name); - rustup_utils::utils::write_file(name, &path, "").unwrap(); + rustup::utils::utils::write_file(name, &path, "").unwrap(); expect_stdout_ok(config, &["rustup", "toolchain", "list"], "nightly"); expect_not_stdout_ok(config, &["rustup", "toolchain", "list"], name); }); @@ -207,7 +209,7 @@ fn file_override_toolchain_err_handling() { setup(&|config| { let cwd = config.current_dir(); let toolchain_file = cwd.join("rust-toolchain"); - rustup_utils::raw::write_file(&toolchain_file, "beta").unwrap(); + rustup::utils::raw::write_file(&toolchain_file, "beta").unwrap(); expect_stderr_ok( config, &["rustc", "--version"], @@ -232,11 +234,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 = rustup_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(); sha_bytes[..10].clone_from_slice(b"aaaaaaaaaa"); let sha_str = String::from_utf8(sha_bytes).unwrap(); - rustup_utils::raw::write_file(&sha_file, &sha_str).unwrap(); + rustup::utils::raw::write_file(&sha_file, &sha_str).unwrap(); expect_ok(config, &["rustup", "default", "nightly"]); }); } @@ -251,7 +253,7 @@ fn bad_sha_on_installer() { let path = file.path(); let filename = path.to_string_lossy(); if filename.ends_with(".tar.gz") || filename.ends_with(".tar.xz") { - rustup_utils::raw::write_file(&path, "xxx").unwrap(); + rustup::utils::raw::write_file(&path, "xxx").unwrap(); } } expect_err(config, &["rustup", "default", "nightly"], "checksum failed"); @@ -807,11 +809,11 @@ fn remove_target_missing_update_hash() { } fn make_component_unavailable(config: &Config, name: &str, target: &TargetTriple) { + use crate::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 = rustup_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 std_pkg = manifest.packages.get_mut(name).unwrap(); @@ -819,7 +821,7 @@ fn make_component_unavailable(config: &Config, name: &str, target: &TargetTriple target_pkg.bins = None; } let ref manifest_str = manifest.stringify(); - rustup_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"); diff --git a/tests/dist.rs b/tests/dist.rs index eec231f0ab..d87deb09cd 100644 --- a/tests/dist.rs +++ b/tests/dist.rs @@ -1,6 +1,10 @@ // Tests of installation and updates from a v2 Rust distribution // server (mocked on the file system) +pub mod mock; + +use crate::mock::dist::*; +use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder}; use rustup::dist::dist::{TargetTriple, ToolchainDesc, DEFAULT_DIST_SERVER}; use rustup::dist::download::DownloadCfg; use rustup::dist::errors::Result; @@ -10,10 +14,8 @@ use rustup::dist::prefix::InstallPrefix; use rustup::dist::temp; use rustup::dist::ErrorKind; use rustup::dist::Notification; -use rustup_mock::dist::*; -use rustup_mock::{MockComponentBuilder, MockFile, MockInstallerBuilder}; -use rustup_utils::raw as utils_raw; -use rustup_utils::utils; +use rustup::utils::raw as utils_raw; +use rustup::utils::utils; use std::cell::Cell; use std::collections::HashMap; use std::fs; diff --git a/tests/dist_install.rs b/tests/dist_install.rs index 7b84c7ffa3..41dcb70e17 100644 --- a/tests/dist_install.rs +++ b/tests/dist_install.rs @@ -1,3 +1,6 @@ +pub mod mock; + +use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder}; use rustup::dist::component::Components; use rustup::dist::component::Transaction; use rustup::dist::component::{DirectoryPackage, Package}; @@ -6,8 +9,7 @@ use rustup::dist::prefix::InstallPrefix; use rustup::dist::temp; use rustup::dist::ErrorKind; use rustup::dist::Notification; -use rustup_mock::{MockComponentBuilder, MockFile, MockInstallerBuilder}; -use rustup_utils::utils; +use rustup::utils::utils; use std::fs::File; use std::io::Write; use tempdir::TempDir; diff --git a/tests/dist_transactions.rs b/tests/dist_transactions.rs index 99e67bf5c8..879526fe67 100644 --- a/tests/dist_transactions.rs +++ b/tests/dist_transactions.rs @@ -4,8 +4,8 @@ use rustup::dist::prefix::InstallPrefix; use rustup::dist::temp; use rustup::dist::ErrorKind; use rustup::dist::Notification; -use rustup_utils::raw as utils_raw; -use rustup_utils::utils; +use rustup::utils::raw as utils_raw; +use rustup::utils::utils; use std::fs; use std::io::Write; use std::path::PathBuf; diff --git a/src/rustup-mock/src/clitools.rs b/tests/mock/clitools.rs similarity index 99% rename from src/rustup-mock/src/clitools.rs rename to tests/mock/clitools.rs index 57dc5cad9c..67ab674482 100644 --- a/src/rustup-mock/src/clitools.rs +++ b/tests/mock/clitools.rs @@ -1,11 +1,11 @@ //! A mock distribution server used by tests/cli-v1.rs and //! tests/cli-v2.rs -use crate::dist::{ +use crate::mock::dist::{ change_channel_date, ManifestVersion, MockChannel, MockComponent, MockDistServer, MockPackage, MockTargetedPackage, }; -use crate::{MockComponentBuilder, MockFile, MockInstallerBuilder}; +use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder}; use lazy_static::lazy_static; use std::cell::RefCell; use std::collections::HashMap; diff --git a/src/rustup-mock/src/dist.rs b/tests/mock/dist.rs similarity index 99% rename from src/rustup-mock/src/dist.rs rename to tests/mock/dist.rs index 0bada25e5a..d9edf5f735 100644 --- a/src/rustup-mock/src/dist.rs +++ b/tests/mock/dist.rs @@ -1,7 +1,7 @@ //! Tools for building and working with the filesystem of a mock Rust //! distribution server, with v1 and v2 manifests. -use crate::MockInstallerBuilder; +use crate::mock::MockInstallerBuilder; use lazy_static::lazy_static; use sha2::{Digest, Sha256}; use std::collections::HashMap; @@ -12,7 +12,7 @@ use std::sync::Mutex; use tempdir::TempDir; use url::Url; -use crate::clitools::hard_link; +use crate::mock::clitools::hard_link; // This function changes the mock manifest for a given channel to that // of a particular date. For advancing the build from e.g. 2016-02-1 diff --git a/src/rustup-mock/src/mock_bin_src.rs b/tests/mock/mock_bin_src.rs similarity index 100% rename from src/rustup-mock/src/mock_bin_src.rs rename to tests/mock/mock_bin_src.rs diff --git a/src/rustup-mock/src/lib.rs b/tests/mock/mod.rs similarity index 100% rename from src/rustup-mock/src/lib.rs rename to tests/mock/mod.rs From f4b225050b87b4353d922f73942bc638e2a501e6 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 10 Mar 2019 21:50:26 +0000 Subject: [PATCH 6/6] Rename rustup-cli to just cli ... to match the rest. --- Cargo.toml | 2 +- src/{rustup-cli => cli}/common.rs | 0 src/{rustup-cli => cli}/download_tracker.rs | 0 src/{rustup-cli => cli}/errors.rs | 0 src/{rustup-cli => cli}/help.rs | 0 src/{rustup-cli => cli}/job.rs | 0 src/{rustup-cli => cli}/log.rs | 0 src/{rustup-cli => cli}/main.rs | 0 src/{rustup-cli => cli}/proxy_mode.rs | 0 src/{rustup-cli => cli}/rustup_mode.rs | 0 src/{rustup-cli => cli}/self_update.rs | 0 src/{rustup-cli => cli}/setup_mode.rs | 0 src/{rustup-cli => cli}/term2.rs | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename src/{rustup-cli => cli}/common.rs (100%) rename src/{rustup-cli => cli}/download_tracker.rs (100%) rename src/{rustup-cli => cli}/errors.rs (100%) rename src/{rustup-cli => cli}/help.rs (100%) rename src/{rustup-cli => cli}/job.rs (100%) rename src/{rustup-cli => cli}/log.rs (100%) rename src/{rustup-cli => cli}/main.rs (100%) rename src/{rustup-cli => cli}/proxy_mode.rs (100%) rename src/{rustup-cli => cli}/rustup_mode.rs (100%) rename src/{rustup-cli => cli}/self_update.rs (100%) rename src/{rustup-cli => cli}/setup_mode.rs (100%) rename src/{rustup-cli => cli}/term2.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 1092e5c5a8..e555af2c8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,7 +75,7 @@ test = false # no unit tests [[bin]] name = "rustup-init" -path = "src/rustup-cli/main.rs" +path = "src/cli/main.rs" test = false # no unit tests [profile.release] diff --git a/src/rustup-cli/common.rs b/src/cli/common.rs similarity index 100% rename from src/rustup-cli/common.rs rename to src/cli/common.rs diff --git a/src/rustup-cli/download_tracker.rs b/src/cli/download_tracker.rs similarity index 100% rename from src/rustup-cli/download_tracker.rs rename to src/cli/download_tracker.rs diff --git a/src/rustup-cli/errors.rs b/src/cli/errors.rs similarity index 100% rename from src/rustup-cli/errors.rs rename to src/cli/errors.rs diff --git a/src/rustup-cli/help.rs b/src/cli/help.rs similarity index 100% rename from src/rustup-cli/help.rs rename to src/cli/help.rs diff --git a/src/rustup-cli/job.rs b/src/cli/job.rs similarity index 100% rename from src/rustup-cli/job.rs rename to src/cli/job.rs diff --git a/src/rustup-cli/log.rs b/src/cli/log.rs similarity index 100% rename from src/rustup-cli/log.rs rename to src/cli/log.rs diff --git a/src/rustup-cli/main.rs b/src/cli/main.rs similarity index 100% rename from src/rustup-cli/main.rs rename to src/cli/main.rs diff --git a/src/rustup-cli/proxy_mode.rs b/src/cli/proxy_mode.rs similarity index 100% rename from src/rustup-cli/proxy_mode.rs rename to src/cli/proxy_mode.rs diff --git a/src/rustup-cli/rustup_mode.rs b/src/cli/rustup_mode.rs similarity index 100% rename from src/rustup-cli/rustup_mode.rs rename to src/cli/rustup_mode.rs diff --git a/src/rustup-cli/self_update.rs b/src/cli/self_update.rs similarity index 100% rename from src/rustup-cli/self_update.rs rename to src/cli/self_update.rs diff --git a/src/rustup-cli/setup_mode.rs b/src/cli/setup_mode.rs similarity index 100% rename from src/rustup-cli/setup_mode.rs rename to src/cli/setup_mode.rs diff --git a/src/rustup-cli/term2.rs b/src/cli/term2.rs similarity index 100% rename from src/rustup-cli/term2.rs rename to src/cli/term2.rs