github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 18:43:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make get_current_exe use impl AsRef<Path>

Browse Source 
- It does not need to require the default to be valid UTF8
This commit is contained in:
Henrik Hørlück Berg 2023-08-19 19:58:49 +02:00 committed by Fabian Boehm
parent a92804a8a1
commit 25d207a8ce
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fish-rust/src/common.rs
View File

@ -27,8 +27,7 @@ use std::ffi::{CStr, CString, OsStr, OsString};
use std::mem;
use std::ops::{Deref, DerefMut};
use std::os::unix::prelude::*;
use std::path::PathBuf;
use std::str::FromStr;
use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicI32, AtomicU32, Ordering};
use std::sync::{Arc, Mutex, TryLockError};
use std::time;
@ -1772,7 +1771,7 @@ pub fn valid_var_name(s: &wstr) -> bool {
}
/// Get the absolute path to the fish executable itself
pub fn get_executable_path(argv0: &str) -> PathBuf {
pub fn get_executable_path(argv0: impl AsRef<Path>) -> PathBuf {
if let Ok(path) = std::env::current_exe() {
if path.exists() {
return path;
@ -1794,7 +1793,7 @@ pub fn get_executable_path(argv0: &str) -> PathBuf {
}
return path;
}
PathBuf::from_str(argv0).unwrap()
argv0.as_ref().to_owned()
}
/// A RAII cleanup object. Unlike in C++ where there is no borrow checker, we can't just provide a