explicitly name anyhow::Result

Author: syphar

src/build.rs

@@ -1,7 +1,6 @@
 use crate::cmd::{Command, MountKind, Runnable, SandboxBuilder};
 use crate::prepare::Prepare;
 use crate::{Crate, Toolchain, Workspace};
-use anyhow::Result;
 use std::path::PathBuf;
 use std::vec::Vec;
 
@@ -51,7 +50,7 @@ impl<'a> BuildBuilder<'a> {
     /// ```no_run
     /// # use rustwide::{WorkspaceBuilder, Toolchain, Crate, cmd::SandboxBuilder};
     /// # use std::error::Error;
-    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// # fn main() -> anyhow::Result<(), Box<dyn Error>> {
     /// # let workspace = WorkspaceBuilder::new("".as_ref(), "").init()?;
     /// # let toolchain = Toolchain::dist("");
     /// # let krate = Crate::local("".as_ref());
@@ -81,7 +80,7 @@ impl<'a> BuildBuilder<'a> {
     /// ```no_run
     /// # use rustwide::{WorkspaceBuilder, Toolchain, Crate, cmd::{MountKind, SandboxBuilder}};
     /// # use std::{error::Error, path::{Path, PathBuf}};
-    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// # fn main() -> anyhow::Result<(), Box<dyn Error>> {
     /// # let workspace = WorkspaceBuilder::new("".as_ref(), "").init()?;
     /// # let toolchain = Toolchain::dist("");
     /// # let krate = Crate::local("".as_ref());
@@ -119,7 +118,7 @@ impl<'a> BuildBuilder<'a> {
     /// ```no_run
     /// # use rustwide::{WorkspaceBuilder, Toolchain, Crate, cmd::SandboxBuilder};
     /// # use std::error::Error;
-    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// # fn main() -> anyhow::Result<(), Box<dyn Error>> {
     /// # let workspace = WorkspaceBuilder::new("".as_ref(), "").init()?;
     /// # let toolchain = Toolchain::dist("");
     /// # let krate = Crate::local("".as_ref());
@@ -131,7 +130,7 @@ impl<'a> BuildBuilder<'a> {
     /// })?;
     /// # Ok(())
     /// # }
-    pub fn run<R, F: FnOnce(&Build) -> Result<R>>(self, f: F) -> Result<R> {
+    pub fn run<R, F: FnOnce(&Build) -> anyhow::Result<R>>(self, f: F) -> anyhow::Result<R> {
         self.build_dir
             .run(self.toolchain, self.krate, self.sandbox, self.patches, f)
     }
@@ -153,7 +152,7 @@ impl BuildDirectory {
     /// ```no_run
     /// # use rustwide::{WorkspaceBuilder, Toolchain, Crate, cmd::SandboxBuilder};
     /// # use std::error::Error;
-    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// # fn main() -> anyhow::Result<(), Box<dyn Error>> {
     /// # let workspace = WorkspaceBuilder::new("".as_ref(), "").init()?;
     /// # let toolchain = Toolchain::dist("");
     /// # let krate = Crate::local("".as_ref());
@@ -181,14 +180,14 @@ impl BuildDirectory {
         }
     }
 
-    pub(crate) fn run<R, F: FnOnce(&Build) -> Result<R>>(
+    pub(crate) fn run<R, F: FnOnce(&Build) -> anyhow::Result<R>>(
         &mut self,
         toolchain: &Toolchain,
         krate: &Crate,
         sandbox: SandboxBuilder,
         patches: Vec<CratePatch>,
         f: F,
-    ) -> Result<R> {
+    ) -> anyhow::Result<R> {
         let source_dir = self.source_dir();
         if source_dir.exists() {
             crate::utils::remove_dir_all(&source_dir)?;
@@ -209,7 +208,7 @@ impl BuildDirectory {
     }
 
     /// Remove all the contents of the build directory, freeing disk space.
-    pub fn purge(&mut self) -> Result<()> {
+    pub fn purge(&mut self) -> anyhow::Result<()> {
         let build_dir = self.build_dir();
         if build_dir.exists() {
             crate::utils::remove_dir_all(&build_dir)?;
@@ -251,7 +250,7 @@ impl<'ws> Build<'ws> {
     /// ```no_run
     /// # use rustwide::{WorkspaceBuilder, Toolchain, Crate, cmd::SandboxBuilder};
     /// # use std::error::Error;
-    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// # fn main() -> anyhow::Result<(), Box<dyn Error>> {
     /// # let workspace = WorkspaceBuilder::new("".as_ref(), "").init()?;
     /// # let toolchain = Toolchain::dist("");
     /// # let krate = Crate::local("".as_ref());
@@ -288,7 +287,7 @@ impl<'ws> Build<'ws> {
     /// ```no_run
     /// # use rustwide::{WorkspaceBuilder, Toolchain, Crate, cmd::SandboxBuilder};
     /// # use std::error::Error;
-    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// # fn main() -> anyhow::Result<(), Box<dyn Error>> {
     /// # let workspace = WorkspaceBuilder::new("".as_ref(), "").init()?;
     /// # let toolchain = Toolchain::dist("");
     /// # let krate = Crate::local("".as_ref());
@@ -322,7 +321,7 @@ impl<'ws> Build<'ws> {
     /// networking is disabled.
     #[cfg(any(feature = "unstable", doc))]
     #[cfg_attr(docs_rs, doc(cfg(feature = "unstable")))]
-    pub fn fetch_build_std_dependencies(&self, targets: &[&str]) -> Result<()> {
+    pub fn fetch_build_std_dependencies(&self, targets: &[&str]) -> anyhow::Result<()> {
         crate::prepare::fetch_deps(
             &self.dir.workspace,
             self.toolchain,

src/crates/local.rs

@@ -1,6 +1,5 @@
 use super::CrateTrait;
 use crate::Workspace;
-use anyhow::Result;
 use log::info;
 use std::path::{Path, PathBuf};
 use walkdir::WalkDir;
@@ -16,17 +15,17 @@ impl Local {
 }
 
 impl CrateTrait for Local {
-    fn fetch(&self, _workspace: &Workspace) -> Result<()> {
+    fn fetch(&self, _workspace: &Workspace) -> anyhow::Result<()> {
         // There is no fetch to do for a local crate.
         Ok(())
     }
 
-    fn purge_from_cache(&self, _workspace: &Workspace) -> Result<()> {
+    fn purge_from_cache(&self, _workspace: &Workspace) -> anyhow::Result<()> {
         // There is no cache to purge for a local crate.
         Ok(())
     }
 
-    fn copy_source_to(&self, _workspace: &Workspace, dest: &Path) -> Result<()> {
+    fn copy_source_to(&self, _workspace: &Workspace, dest: &Path) -> anyhow::Result<()> {
         info!(
             "copying local crate from {} to {}",
             self.path.display(),
@@ -43,7 +42,7 @@ impl std::fmt::Display for Local {
     }
 }
 
-fn copy_dir(src: &Path, dest: &Path) -> Result<()> {
+fn copy_dir(src: &Path, dest: &Path) -> anyhow::Result<()> {
     let src = crate::utils::normalize_path(src);
     let dest = crate::utils::normalize_path(dest);
 
@@ -78,7 +77,7 @@ mod tests {
     use anyhow::Result;
 
     #[test]
-    fn test_copy_dir() -> Result<()> {
+    fn test_copy_dir() -> anyhow::Result<()> {
         let tmp_src = tempfile::tempdir()?;
         let tmp_dest = tempfile::tempdir()?;
 
@@ -99,7 +98,7 @@ mod tests {
     }
 
     #[test]
-    fn test_no_copy_target() -> Result<()> {
+    fn test_no_copy_target() -> anyhow::Result<()> {
         let (src, dest) = (tempfile::tempdir()?, tempfile::tempdir()?);
         std::fs::create_dir(src.path().join("target"))?;
         std::fs::write(
@@ -116,7 +115,7 @@ mod tests {
     }
 
     #[test]
-    fn test_copy_symlinks() -> Result<()> {
+    fn test_copy_symlinks() -> anyhow::Result<()> {
         use std::{fs, os, path::Path};
 
         let tmp_src = tempfile::tempdir()?;

src/crates/mod.rs

@@ -3,16 +3,15 @@ mod local;
 mod registry;
 
 use crate::Workspace;
-use anyhow::Result;
 use log::info;
 use std::path::Path;
 
 pub use registry::AlternativeRegistry;
 
 trait CrateTrait: std::fmt::Display {
-    fn fetch(&self, workspace: &Workspace) -> Result<()>;
-    fn purge_from_cache(&self, workspace: &Workspace) -> Result<()>;
-    fn copy_source_to(&self, workspace: &Workspace, dest: &Path) -> Result<()>;
+    fn fetch(&self, workspace: &Workspace) -> anyhow::Result<()>;
+    fn purge_from_cache(&self, workspace: &Workspace) -> anyhow::Result<()>;
+    fn copy_source_to(&self, workspace: &Workspace, dest: &Path) -> anyhow::Result<()>;
 }
 
 enum CrateType {
@@ -56,12 +55,12 @@ impl Crate {
 
     /// Fetch the crate's source code and cache it in the workspace. This method will reach out to
     /// the network for some crate types.
-    pub fn fetch(&self, workspace: &Workspace) -> Result<()> {
+    pub fn fetch(&self, workspace: &Workspace) -> anyhow::Result<()> {
         self.as_trait().fetch(workspace)
     }
 
     /// Remove the cached copy of this crate. The method will do nothing if the crate isn't cached.
-    pub fn purge_from_cache(&self, workspace: &Workspace) -> Result<()> {
+    pub fn purge_from_cache(&self, workspace: &Workspace) -> anyhow::Result<()> {
         self.as_trait().purge_from_cache(workspace)
     }
 
@@ -75,7 +74,7 @@ impl Crate {
         }
     }
 
-    pub(crate) fn copy_source_to(&self, workspace: &Workspace, dest: &Path) -> Result<()> {
+    pub(crate) fn copy_source_to(&self, workspace: &Workspace, dest: &Path) -> anyhow::Result<()> {
         if dest.exists() {
             info!(
                 "crate source directory {} already exists, cleaning it up",

src/inside_docker.rs

@@ -1,6 +1,5 @@
 use crate::cmd::Command;
 use crate::workspace::Workspace;
-use anyhow::Result;
 use base64::{engine::general_purpose::STANDARD as b64, Engine};
 use getrandom::getrandom;
 use log::info;
@@ -12,7 +11,7 @@ pub(crate) struct CurrentContainer {
 }
 
 impl CurrentContainer {
-    pub(crate) fn detect(workspace: &Workspace) -> Result<Option<Self>> {
+    pub(crate) fn detect(workspace: &Workspace) -> anyhow::Result<Option<Self>> {
         if let Some(id) = probe_container_id(workspace)? {
             info!("inspecting the current container");
             let inspect = Command::new(workspace, "docker")
@@ -45,7 +44,7 @@ impl CurrentContainer {
 /// This function uses a simpler but slower method to get the ID: a file with a random string is
 /// created in the temp directory, the list of all the containers is fetched from Docker and then
 /// `cat` is executed inside each of them to check whether they have the same random string.
-pub(crate) fn probe_container_id(workspace: &Workspace) -> Result<Option<String>> {
+pub(crate) fn probe_container_id(workspace: &Workspace) -> anyhow::Result<Option<String>> {
     info!("detecting the ID of the container where rustwide is running");
 
     // Create the probe on the current file system

src/native/unix.rs

@@ -1,6 +1,5 @@
 use super::CurrentUser;
 use crate::cmd::KillFailedError;
-use anyhow::Result;
 use nix::{
     sys::signal::{kill, Signal},
     unistd::{Gid, Pid, Uid},
@@ -11,7 +10,7 @@ use std::path::Path;
 
 const EXECUTABLE_BITS: u32 = 0o5;
 
-pub(crate) fn kill_process(id: u32) -> Result<(), KillFailedError> {
+pub(crate) fn kill_process(id: u32) -> anyhow::Result<(), KillFailedError> {
     match kill(Pid::from_raw(id as i32), Signal::SIGKILL) {
         Ok(()) => Ok(()),
         Err(err) => Err(KillFailedError {
@@ -29,7 +28,7 @@ pub(crate) fn current_user() -> Option<CurrentUser> {
     })
 }
 
-fn executable_mode_for(path: &Path) -> Result<u32> {
+fn executable_mode_for(path: &Path) -> anyhow::Result<u32> {
     let metadata = path.metadata()?;
 
     let user = current_user().unwrap();
@@ -43,14 +42,14 @@ fn executable_mode_for(path: &Path) -> Result<u32> {
     }
 }
 
-pub(crate) fn is_executable<P: AsRef<Path>>(path: P) -> Result<bool> {
+pub(crate) fn is_executable<P: AsRef<Path>>(path: P) -> anyhow::Result<bool> {
     let path = path.as_ref();
 
     let expected_mode = executable_mode_for(path)?;
     Ok(path.metadata()?.mode() & expected_mode == expected_mode)
 }
 
-pub(crate) fn make_executable<P: AsRef<Path>>(path: P) -> Result<()> {
+pub(crate) fn make_executable<P: AsRef<Path>>(path: P) -> anyhow::Result<()> {
     let path = path.as_ref();
 
     // Set the executable and readable bits on the file