aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-external-packages/src/symfony/process/executable_finder.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/process/executable_finder.rs')
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/executable_finder.rs19
1 files changed, 6 insertions, 13 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/process/executable_finder.rs b/crates/shirabe-external-packages/src/symfony/process/executable_finder.rs
index 3c44b4ad..a00a302c 100644
--- a/crates/shirabe-external-packages/src/symfony/process/executable_finder.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/executable_finder.rs
@@ -25,7 +25,7 @@ impl ExecutableFinder {
pub fn find(&self, name: &str, default: Option<&str>, extra_dirs: &[String]) -> Option<String> {
// windows built-in commands that are present in cmd.exe should not be resolved using PATH as they do not exist as exes
- if shirabe_php_shim::DIRECTORY_SEPARATOR == "\\"
+ if std::path::MAIN_SEPARATOR == '\\'
&& CMD_BUILTINS.contains(&shirabe_php_shim::strtolower(name).as_str())
{
return Some(name.to_string());
@@ -39,7 +39,7 @@ impl ExecutableFinder {
dirs.extend_from_slice(extra_dirs);
let mut suffixes: Vec<String> = vec![];
- if shirabe_php_shim::DIRECTORY_SEPARATOR == "\\" {
+ if std::path::MAIN_SEPARATOR == '\\' {
let path_ext =
shirabe_php_shim::getenv("PATHEXT").map(|v| v.to_string_lossy().into_owned());
suffixes = self.suffixes.clone();
@@ -68,13 +68,9 @@ impl ExecutableFinder {
for suffix in &suffixes {
for dir in &dirs {
let dir = if dir.is_empty() { "." } else { dir.as_str() };
- let file = format!(
- "{dir}{}{name}{suffix}",
- shirabe_php_shim::DIRECTORY_SEPARATOR
- );
+ let file = format!("{dir}{}{name}{suffix}", std::path::MAIN_SEPARATOR);
if shirabe_php_shim::is_file(&file)
- && (shirabe_php_shim::DIRECTORY_SEPARATOR == "\\"
- || shirabe_php_shim::is_executable(&file))
+ && (std::path::MAIN_SEPARATOR == '\\' || shirabe_php_shim::is_executable(&file))
{
return Some(file);
}
@@ -88,12 +84,9 @@ impl ExecutableFinder {
}
}
- if shirabe_php_shim::DIRECTORY_SEPARATOR == "\\"
+ if std::path::MAIN_SEPARATOR == '\\'
|| name.len()
- != shirabe_php_shim::strcspn(
- name,
- &format!("/{}", shirabe_php_shim::DIRECTORY_SEPARATOR),
- )
+ != shirabe_php_shim::strcspn(name, &format!("/{}", std::path::MAIN_SEPARATOR))
{
return default.map(ToString::to_string);
}