From 5367b366d1cf9e39994e0b735d84c60fdf64b04c Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Sat, 23 Jul 2022 19:17:47 +1000 Subject: [PATCH] Use `home::cargo_home` in `helpers::cargo_home` Signed-off-by: Jiahao XU --- src/helpers.rs | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/helpers.rs b/src/helpers.rs index b2ed7b3e..e6bf8b40 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -45,34 +45,10 @@ mod crate_name; pub use crate_name::CrateName; pub fn cargo_home() -> Result<&'static Path, io::Error> { - fn cargo_home_inner() -> Result { - if let Some(p) = env::var_os("CARGO_HOME") { - let p = PathBuf::from(p); - debug!("using CARGO_HOME ({})", p.display()); - return Ok(p); - } - - // Standard $HOME/.cargo - if let Some(mut d) = dirs::home_dir() { - d.push(".cargo"); - - if d.exists() { - debug!("using $HOME/.cargo: {}", d.display()); - - return Ok(d); - } - } - - Err(io::Error::new( - io::ErrorKind::NotFound, - "Failed to detect cargo home", - )) - } - static CARGO_HOME: OnceCell = OnceCell::new(); CARGO_HOME - .get_or_try_init(cargo_home_inner) + .get_or_try_init(home::cargo_home) .map(ops::Deref::deref) }