numtide/treefmt
1
1
Fork 0
mirror of https://github.com/numtide/treefmt.git synced 2024-09-11 17:07:44 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

lib: simplify expand_env

Browse Source
This commit is contained in:
zimbatm 2021-05-07 16:25:05 +02:00
parent bcd58b36ec
commit c1b1b2f99b
No known key found for this signature in database
GPG Key ID: 71BAF6D40C1D63D7
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib.rs
View File

@ -12,10 +12,11 @@ use anyhow::Result;
use filetime::FileTime;
use path_clean::PathClean;
use serde::{Deserialize, Serialize};
use std::env;
use std::fs::Metadata;
use std::path::PathBuf;
use std::{fmt, path::Path};
use which::which;
use which::which_in;
/// Mtime represents a unix epoch file modification time
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, Copy, Clone)]
@ -41,17 +42,7 @@ pub fn get_meta_mtime(metadata: &Metadata) -> Mtime {
/// Resolve the command into an absolute path.
fn expand_exe(command: &String, reference: &Path) -> Result<PathBuf> {
let path = if let Some(_) = command.find('/') {
let path = Path::new(&command);
if path.is_absolute() {
path.to_path_buf()
} else {
reference.join(path)
}
} else {
which(command)?
};
Ok(path.clean())
Ok(which_in(command, env::var_os("PATH"), reference)?.clean())
}
/// Returns an absolute path. If the path is absolute already, leave it alone. Otherwise join it to the reference path.