cli: rename CLIError to CliError

Author: djc

src/bin/rustup-init.rs

@@ -124,7 +124,7 @@ async fn run_rustup_inner(
         }
         None => {
             // Weird case. No arg0, or it's unparsable.
-            Err(rustup::cli::errors::CLIError::NoExeName.into())
+            Err(rustup::cli::errors::CliError::NoExeName.into())
         }
     }
 }

src/cli/errors.rs

@@ -10,7 +10,7 @@ use strsim::damerau_levenshtein;
 use thiserror::Error as ThisError;
 
 #[derive(ThisError, Debug)]
-pub enum CLIError {
+pub enum CliError {
     #[error("couldn't determine self executable name")]
     NoExeName,
     #[error("rustup is not installed at '{}'", .p.display())]

src/cli/rustup_mode.rs

@@ -26,7 +26,7 @@ use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
 use crate::{
     cli::{
         common::{self, PackageUpdate, update_console_filter},
-        errors::CLIError,
+        errors::CliError,
         help::*,
         self_update::{self, SelfUpdateMode, check_rustup_update},
         topical_doc,
@@ -1805,7 +1805,7 @@ fn set_auto_self_update(
         let arg0 = arg0
             .as_ref()
             .and_then(|a| a.to_str())
-            .ok_or(CLIError::NoExeName)?;
+            .ok_or(CliError::NoExeName)?;
         warn!(
             "{} is built with the no-self-update feature: setting auto-self-update will not have any effect.",
             arg0

src/cli/self_update.rs

@@ -978,7 +978,7 @@ pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::Exi
     let cargo_home = process.cargo_home()?;
 
     if !cargo_home.join(format!("bin/rustup{EXE_SUFFIX}")).exists() {
-        return Err(CLIError::NotSelfInstalled { p: cargo_home }.into());
+        return Err(CliError::NotSelfInstalled { p: cargo_home }.into());
     }
 
     if !no_prompt {
@@ -1010,12 +1010,12 @@ pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::Exi
     // Delete everything in CARGO_HOME *except* the rustup bin
 
     // First everything except the bin directory
-    let diriter = fs::read_dir(&cargo_home).map_err(|e| CLIError::ReadDirError {
+    let diriter = fs::read_dir(&cargo_home).map_err(|e| CliError::ReadDirError {
         p: cargo_home.clone(),
         source: e,
     })?;
     for dirent in diriter {
-        let dirent = dirent.map_err(|e| CLIError::ReadDirError {
+        let dirent = dirent.map_err(|e| CliError::ReadDirError {
             p: cargo_home.clone(),
             source: e,
         })?;
@@ -1036,12 +1036,12 @@ pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::Exi
         .map(|t| format!("{t}{EXE_SUFFIX}"));
     let tools: Vec<_> = tools.chain(vec![format!("rustup{EXE_SUFFIX}")]).collect();
     let bin_dir = cargo_home.join("bin");
-    let diriter = fs::read_dir(&bin_dir).map_err(|e| CLIError::ReadDirError {
+    let diriter = fs::read_dir(&bin_dir).map_err(|e| CliError::ReadDirError {
         p: bin_dir.clone(),
         source: e,
     })?;
     for dirent in diriter {
-        let dirent = dirent.map_err(|e| CLIError::ReadDirError {
+        let dirent = dirent.map_err(|e| CliError::ReadDirError {
             p: bin_dir.clone(),
             source: e,
         })?;
@@ -1227,7 +1227,7 @@ pub(crate) async fn prepare_update(dl_cfg: &DownloadCfg<'_>) -> Result<Option<Pa
     let setup_path = cargo_home.join(format!("bin{MAIN_SEPARATOR}rustup-init{EXE_SUFFIX}"));
 
     if !rustup_path.exists() {
-        return Err(CLIError::NotSelfInstalled { p: cargo_home }.into());
+        return Err(CliError::NotSelfInstalled { p: cargo_home }.into());
     }
 
     if setup_path.exists() {

src/cli/self_update/windows.rs

@@ -375,7 +375,7 @@ pub fn complete_windows_uninstall(process: &Process) -> Result<utils::ExitCode>
         .stdout(Stdio::null())
         .stderr(Stdio::null())
         .spawn()
-        .context(CLIError::WindowsUninstallMadness)?;
+        .context(CliError::WindowsUninstallMadness)?;
 
     Ok(utils::ExitCode(0))
 }
@@ -398,7 +398,7 @@ pub(crate) fn wait_for_parent() -> Result<()> {
         let snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
         if snapshot == INVALID_HANDLE_VALUE {
             let err = io::Error::last_os_error();
-            return Err(err).context(CLIError::WindowsUninstallMadness);
+            return Err(err).context(CliError::WindowsUninstallMadness);
         }
 
         let snapshot = scopeguard::guard(snapshot, |h| {
@@ -412,15 +412,15 @@ pub(crate) fn wait_for_parent() -> Result<()> {
         let success = Process32First(*snapshot, &mut entry);
         if success == 0 {
             let err = io::Error::last_os_error();
-            return Err(err).context(CLIError::WindowsUninstallMadness);
+            return Err(err).context(CliError::WindowsUninstallMadness);
         }
 
         let this_pid = GetCurrentProcessId();
         while entry.th32ProcessID != this_pid {
             let success = Process32Next(*snapshot, &mut entry);
             if success == 0 {
                 let err = io::Error::last_os_error();
-                return Err(err).context(CLIError::WindowsUninstallMadness);
+                return Err(err).context(CliError::WindowsUninstallMadness);
             }
         }
 
@@ -445,7 +445,7 @@ pub(crate) fn wait_for_parent() -> Result<()> {
 
         if res != WAIT_OBJECT_0 {
             let err = io::Error::last_os_error();
-            return Err(err).context(CLIError::WindowsUninstallMadness);
+            return Err(err).context(CliError::WindowsUninstallMadness);
         }
     }
 
@@ -514,7 +514,7 @@ fn get_windows_path_var() -> Result<Option<HSTRING>> {
             Ok(None)
         }
         Err(e) if e.code() == HRESULT::from_win32(ERROR_FILE_NOT_FOUND) => Ok(Some(HSTRING::new())),
-        Err(e) => Err(e).context(CLIError::WindowsUninstallMadness),
+        Err(e) => Err(e).context(CliError::WindowsUninstallMadness),
     }
 }
 
@@ -731,7 +731,7 @@ pub(crate) fn delete_rustup_and_cargo_home(process: &Process) -> Result<()> {
 
         if gc_handle == INVALID_HANDLE_VALUE {
             let err = io::Error::last_os_error();
-            return Err(err).context(CLIError::WindowsUninstallMadness);
+            return Err(err).context(CliError::WindowsUninstallMadness);
         }
 
         scopeguard::guard(gc_handle, |h| {
@@ -741,7 +741,7 @@ pub(crate) fn delete_rustup_and_cargo_home(process: &Process) -> Result<()> {
 
     Command::new(gc_exe)
         .spawn()
-        .context(CLIError::WindowsUninstallMadness)?;
+        .context(CliError::WindowsUninstallMadness)?;
 
     // The catch 22 article says we must sleep here to give
     // Windows a chance to bump the processes file reference