Unnest rustup's dist crate

Author: dwijnand

Cargo.lock

@@ -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"
 

Cargo.toml

@@ -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
 

appveyor.yml

@@ -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");
 }
 

build.rs

@@ -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
 

ci/run.sh

@@ -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)]

src/config.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};

src/rustup-dist/src/component/components.rs renamed to src/dist/component/components.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;

src/rustup-dist/src/component/mod.rs renamed to src/dist/component/mod.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;

src/rustup-dist/src/component/package.rs renamed to src/dist/component/package.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"];

src/rustup-dist/src/component/transaction.rs renamed to src/dist/component/transaction.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;

src/rustup-dist/src/config.rs renamed to src/dist/config.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;

src/rustup-dist/src/dist.rs renamed to src/dist/dist.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};

src/rustup-dist/src/download.rs renamed to src/dist/download.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"];

src/rustup-dist/src/errors.rs renamed to src/dist/errors.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> =

src/rustup-dist/src/manifest.rs renamed to src/dist/manifest.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;
 

src/rustup-dist/src/manifestation.rs renamed to src/dist/manifestation.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;

src/rustup-dist/src/lib.rs renamed to src/dist/mod.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);
     }
 

src/rustup-dist/src/notifications.rs renamed to src/dist/notifications.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;
 

src/rustup-dist/src/prefix.rs renamed to src/dist/prefix.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;

src/rustup-dist/src/temp.rs renamed to src/dist/temp.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<rustup_dist::Notification<'a>> for Notification<'a> {
-    fn from(n: rustup_dist::Notification<'a>) -> Notification<'a> {
+impl<'a> From<crate::dist::Notification<'a>> for Notification<'a> {
+    fn from(n: crate::dist::Notification<'a>) -> Notification<'a> {
         Notification::Install(n)
     }
 }

src/errors.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;

src/install.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);
     }
 

src/lib.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;