remove Result:: prefixes

Author: beeequeue

src/archives.rs

@@ -55,7 +55,7 @@ pub fn extract_archive(bytes: Response, path: &Path) -> Result<()> {
             .unwrap_or_else(|| path.to_str().unwrap())
     );
 
-    Result::Ok(())
+    Ok(())
 }
 
 #[cfg(unix)]
@@ -97,7 +97,7 @@ pub fn extract_archive(bytes: Response, path: &Path) -> Result<()> {
     if !errors.is_empty() {
         remove_dir_all(version_dir_path).expect("Couldn't clean up version.");
 
-        return Result::Err(anyhow::anyhow!(
+        return Err(anyhow::anyhow!(
             "Failed to extract all files:\n{:?}",
             errors
                 .into_iter()
@@ -109,5 +109,5 @@ pub fn extract_archive(bytes: Response, path: &Path) -> Result<()> {
 
     println!("Extracted to {:?}", version_dir_path);
 
-    Result::Ok(())
+    Ok(())
 }

src/main.rs

@@ -119,6 +119,6 @@ fn main() -> Result<()> {
         Subcommands::Use(ref options) => SwitchCommand::run(&config, options),
         Subcommands::ParseVersion(ref options) => ParseVersionCommand::run(&config, options),
         #[allow(unreachable_patterns)]
-        _ => Result::Ok(()),
+        _ => Ok(()),
     }
 }

src/subcommand/install.rs

@@ -54,7 +54,7 @@ impl Action<InstallCommand> for InstallCommand {
                 version_to_install.version()
             );
 
-            return Result::Ok(());
+            return Ok(());
         }
 
         download_and_extract_to(
@@ -79,7 +79,7 @@ impl Action<InstallCommand> for InstallCommand {
             )?;
         }
 
-        Result::Ok(())
+        Ok(())
     }
 }
 

src/subcommand/switch.rs

@@ -56,7 +56,7 @@ impl Action<SwitchCommand> for SwitchCommand {
         }
 
         let result = set_shims(config, version.version());
-        if let Result::Ok(()) = result {
+        if let Ok(()) = result {
             println!("Switched to {}", version.to_string());
         }
 
@@ -69,16 +69,12 @@ fn set_shims(config: &Config, version: &Version) -> Result<()> {
     let shims_dir = config.get_shims_dir();
 
     if !InstalledNodeVersion::is_installed(config, version) {
-        anyhow::bail!("{} is not installed", version);
+        anyhow::bail!("{version} is not installed");
     }
 
     if read_link(&shims_dir).is_ok() {
-        if let Result::Err(err) = remove_dir(&shims_dir) {
-            anyhow::bail!(
-                "Could not remove old symlink at {:?}: {}",
-                shims_dir,
-                err.to_string()
-            );
+        if let Err(err) = remove_dir(&shims_dir) {
+            anyhow::bail!("Could not remove old symlink at {shims_dir:?}: {err}",);
         }
     }
 

src/subcommand/uninstall.rs

@@ -38,7 +38,7 @@ impl Action<UninstallCommand> for UninstallCommand {
                     .with_prompt("Are you sure you want to uninstall it?")
                     .interact()?)
             {
-                return Result::Ok(());
+                return Ok(());
             }
 
             InstalledNodeVersion::deselect(config)?;

tests/utils.rs

@@ -32,7 +32,7 @@ pub fn setup_integration_test() -> Result<(TempDir, Command)> {
     let mut cmd = Command::cargo_bin("nvm").expect("Could not create Command");
     cmd.args(&["--dir", &temp_dir.to_string_lossy()]);
 
-    Result::Ok((temp_dir, cmd))
+    Ok((temp_dir, cmd))
 }
 
 pub fn install_mock_version(path: &Path, version_str: &str) -> Result<()> {
@@ -54,7 +54,7 @@ pub fn install_mock_version(path: &Path, version_str: &str) -> Result<()> {
             .unwrap_or_else(|err| panic!("Failed to write to {:#?}: {}", &file_path, err))
     }
 
-    Result::Ok(())
+    Ok(())
 }
 
 #[allow(dead_code)]
@@ -112,7 +112,7 @@ stderr output:
         )
     }
 
-    Result::Ok(())
+    Ok(())
 }
 
 #[allow(dead_code)]
@@ -141,19 +141,19 @@ pub fn assert_version_installed(
         }
     }
 
-    Result::Ok(())
+    Ok(())
 }
 
 #[allow(dead_code)]
 pub fn get_selected_version(temp_dir: &TempDir) -> Option<String> {
     let symlink_path = temp_dir.child("shims");
 
     match fs::read_link(&symlink_path) {
-        Result::Ok(shims_dir) => {
+        Ok(shims_dir) => {
             let file_path = shims_dir.join(required_files()[0]);
 
             Some(fs::read_to_string(&file_path).unwrap())
         },
-        Result::Err(_) => None,
+        Err(_) => None,
     }
 }