Skip to content

Fix home_dir() and current_dir() regression #3938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 12, 2024
Merged

Fix home_dir() and current_dir() regression #3938

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcb31a1
Fix home_dir() and current_dir() regression
djc Jul 11, 2024
d327554
Forward to Process::var_os() directly
djc Jul 11, 2024
f256759
Rename currentprocess to process
djc Jul 11, 2024
52157df
Rename OSProcess to OsProcess
djc Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/currentprocess.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,17 @@ impl Process {
impl home::env::Env for Process {
fn home_dir(&self) -> Option<PathBuf> {
match self {
Process::OSProcess(_) => self.var("HOME").ok().map(|v| v.into()),
Process::OSProcess(_) => home::env::OS_ENV.home_dir(),
#[cfg(feature = "test")]
Process::TestProcess(_) => home::env::OS_ENV.home_dir(),
Process::TestProcess(_) => self.var("HOME").ok().map(|v| v.into()),
}
}

fn current_dir(&self) -> Result<PathBuf, io::Error> {
match self {
Process::OSProcess(_) => self.current_dir(),
Process::OSProcess(_) => home::env::OS_ENV.current_dir(),
#[cfg(feature = "test")]
Process::TestProcess(_) => home::env::OS_ENV.current_dir(),
Process::TestProcess(_) => self.current_dir(),
}
}

Expand Down