mirror of
https://github.com/nushell/nushell.git
synced 2025-05-31 07:08:22 +02:00
fix: clear jobs _after_ traversing jobs for kill_all (#15685)
# Description Move clear jobs to _after_ traversing them, in order to kill them. # User-Facing Changes None # Tests + Formatting It looks like it's only used once, in crates/nu-engine/src/exit.rs
This commit is contained in:
parent
ff8831318d
commit
583cb96cff
@ -112,13 +112,13 @@ impl Jobs {
|
|||||||
pub fn kill_all(&mut self) -> std::io::Result<()> {
|
pub fn kill_all(&mut self) -> std::io::Result<()> {
|
||||||
self.last_frozen_job_id = None;
|
self.last_frozen_job_id = None;
|
||||||
|
|
||||||
self.jobs.clear();
|
|
||||||
|
|
||||||
let first_err = self
|
let first_err = self
|
||||||
.iter()
|
.iter()
|
||||||
.map(|(_, job)| job.kill().err())
|
.map(|(_, job)| job.kill().err())
|
||||||
.fold(None, |acc, x| acc.or(x));
|
.fold(None, |acc, x| acc.or(x));
|
||||||
|
|
||||||
|
self.jobs.clear();
|
||||||
|
|
||||||
if let Some(err) = first_err {
|
if let Some(err) = first_err {
|
||||||
Err(err)
|
Err(err)
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user