Merge pull request #1719 from dwijnand/merge-errors

Merge utils+dist errors into rustup errors

Author: nrc

src/cli/errors.rs

@@ -11,8 +11,6 @@ use rustup::dist::temp;
 error_chain! {
     links {
         Rustup(rustup::Error, rustup::ErrorKind);
-        Dist(rustup::dist::Error, rustup::dist::ErrorKind);
-        Utils(rustup::utils::Error, rustup::utils::ErrorKind);
     }
 
     foreign_links {

src/command.rs

@@ -16,7 +16,7 @@ pub fn run_command_for_dir<S: AsRef<OsStr>>(
     // when and why this is needed.
     cmd.stdin(process::Stdio::inherit());
 
-    return exec(&mut cmd).chain_err(|| crate::utils::ErrorKind::RunningCommand {
+    return exec(&mut cmd).chain_err(|| crate::ErrorKind::RunningCommand {
         name: OsStr::new(arg0).to_owned(),
     });
 

src/dist/component/components.rs

@@ -1,5 +1,5 @@
-use crate::dist::errors::*;
 use crate::dist::prefix::InstallPrefix;
+use crate::errors::*;
 /// The representation of the installed toolchain and its components.
 /// `Components` and `DirectoryPackage` are the two sides of the
 /// installation / uninstallation process.

src/dist/component/package.rs

@@ -5,8 +5,8 @@
 use crate::dist::component::components::*;
 use crate::dist::component::transaction::*;
 
-use crate::dist::errors::*;
 use crate::dist::temp;
+use crate::errors::*;
 use crate::utils::utils;
 
 use std::collections::HashSet;

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::dist::errors::*;
 use crate::dist::notifications::*;
 use crate::dist::prefix::InstallPrefix;
 use crate::dist::temp;
+use crate::errors::*;
 use crate::utils::utils;
 
 use std::fs::File;

src/dist/config.rs

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

src/dist/dist.rs

@@ -1,11 +1,11 @@
 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 crate::errors::*;
 use crate::utils::utils;
 
 use std::env;
@@ -563,7 +563,7 @@ pub fn update_from_dist_<'a>(
             };
         }
         Ok(None) => return Ok(None),
-        Err(Error(ErrorKind::Utils(crate::utils::ErrorKind::DownloadNotExists { .. }), _)) => {
+        Err(Error(crate::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(crate::utils::ErrorKind::DownloadNotExists { .. }), _)) => {
+        Err(Error(crate::ErrorKind::DownloadNotExists { .. }, _)) => {
             return Err(format!("no release found for '{}'", toolchain.manifest_name()).into());
         }
         Err(e @ Error(ErrorKind::ChecksumFailed { .. }, _)) => {
@@ -597,13 +597,12 @@ pub fn update_from_dist_<'a>(
     ) {
         Ok(None) => Ok(None),
         Ok(Some(hash)) => Ok(Some(hash)),
-        e @ Err(Error(ErrorKind::Utils(crate::utils::ErrorKind::DownloadNotExists { .. }), _)) => e
-            .chain_err(|| {
-                format!(
-                    "could not download nonexistent rust version `{}`",
-                    toolchain_str
-                )
-            }),
+        e @ Err(Error(crate::ErrorKind::DownloadNotExists { .. }, _)) => e.chain_err(|| {
+            format!(
+                "could not download nonexistent rust version `{}`",
+                toolchain_str
+            )
+        }),
         Err(e) => Err(e),
     }
 }

src/dist/download.rs

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

src/dist/errors.rs

@@ -10,7 +10,7 @@
 //!
 //! See tests/channel-rust-nightly-example.toml for an example.
 
-use crate::dist::errors::*;
+use crate::errors::*;
 use crate::utils::toml_utils::*;
 
 use crate::dist::dist::TargetTriple;

src/dist/manifest.rs

@@ -5,11 +5,11 @@ use crate::dist::component::{Components, Package, TarGzPackage, TarXzPackage, Tr
 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 crate::errors::*;
 use crate::utils::utils;
 use std::path::Path;
 

src/dist/manifestation.rs

@@ -1,6 +1,5 @@
 //! Installation from a Rust distribution server
 
-pub use crate::dist::errors::*;
 pub use crate::dist::notifications::Notification;
 
 pub mod temp;
@@ -9,8 +8,6 @@ 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;
 pub mod notifications;

src/dist/mod.rs

@@ -1,6 +1,6 @@
 use crate::dist::dist::TargetTriple;
-use crate::dist::errors::*;
 use crate::dist::temp;
+use crate::errors::*;
 use crate::utils::notify::NotificationLevel;
 use std::fmt::{self, Display};
 use std::path::Path;