h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-29 18:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary Pid::get() calls

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi
2024-11-11 15:14:48 -06:00
parent fc47d9fa1d
commit 4061ef7137
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/builtins/jobs.rs
View File

@@ -104,7 +104,7 @@ fn builtin_jobs_print(j: &Job, mode: JobsPrintMode, header: bool, streams: &mut
}
for p in j.external_procs() {
out += &sprintf!("%d\n", p.pid.load().unwrap().get())[..];
out += &sprintf!("%d\n", p.pid.load().unwrap())[..];
}
streams.out.append(out);
}

2
src/exec.rs
View File

@@ -881,7 +881,7 @@ fn exec_external_command(
exec_fork,
"Fork #%d, pid %d: spawn external command '%s' from '%ls'",
count,
pid.get(),
pid,
p.actual_cmd,
file.as_ref()
.map(|s| s.as_utfstr())

11
src/proc.rs
View File

@@ -1110,7 +1110,7 @@ pub fn signal(&self, signal: i32) -> bool {
} else {
charptr2wcstring(strsignal)
};
wperror(&sprintf!("killpg(%d, %s)", pgid.get(), strsignal));
wperror(&sprintf!("killpg(%d, %s)", pgid, strsignal));
return false;
}
} else {
@@ -1502,13 +1502,10 @@ fn process_mark_finished_children(parser: &Parser, block_ok: bool) {
WNOHANG | WUNTRACED | WCONTINUED,
)
};
if pid <= 0 {
let Some(pid) = Pid::new(pid) else {
continue;
}
assert!(
pid == proc.pid().unwrap().get(),
"Unexpected waitpid() return"
);
};
assert!(pid == proc.pid().unwrap(), "Unexpected waitpid() return");
// The process has stopped or exited! Update its status.
let status = ProcStatus::from_waitpid(statusv);