Ran the codebase through rustfmt
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
use crate::{
|
||||
jobs::{JobBldr, JobCmdFlags, JobID},
|
||||
libsh::error::{ShErr, ShErrKind, ShResult},
|
||||
parse::{NdRule, Node, lex::Span},
|
||||
parse::{lex::Span, NdRule, Node},
|
||||
prelude::*,
|
||||
procio::{IoStack, borrow_fd},
|
||||
procio::{borrow_fd, IoStack},
|
||||
state::{self, read_jobs, write_jobs},
|
||||
};
|
||||
|
||||
@@ -181,7 +181,7 @@ pub fn jobs(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<(
|
||||
}
|
||||
|
||||
pub fn disown(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<()> {
|
||||
let blame = node.get_span().clone();
|
||||
let blame = node.get_span().clone();
|
||||
let NdRule::Command {
|
||||
assignments: _,
|
||||
argv,
|
||||
@@ -196,29 +196,33 @@ pub fn disown(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult
|
||||
let curr_job_id = if let Some(id) = read_jobs(|j| j.curr_job()) {
|
||||
id
|
||||
} else {
|
||||
return Err(ShErr::full(ShErrKind::ExecFail, "disown: No jobs to disown", blame));
|
||||
return Err(ShErr::full(
|
||||
ShErrKind::ExecFail,
|
||||
"disown: No jobs to disown",
|
||||
blame,
|
||||
));
|
||||
};
|
||||
|
||||
let mut tabid = curr_job_id;
|
||||
let mut nohup = false;
|
||||
let mut disown_all = false;
|
||||
let mut nohup = false;
|
||||
let mut disown_all = false;
|
||||
|
||||
while let Some((arg, span)) = argv.next() {
|
||||
match arg.as_str() {
|
||||
"-h" => nohup = true,
|
||||
"-a" => disown_all = true,
|
||||
_ => {
|
||||
tabid = parse_job_id(&arg, span.clone())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
while let Some((arg, span)) = argv.next() {
|
||||
match arg.as_str() {
|
||||
"-h" => nohup = true,
|
||||
"-a" => disown_all = true,
|
||||
_ => {
|
||||
tabid = parse_job_id(&arg, span.clone())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if disown_all {
|
||||
write_jobs(|j| j.disown_all(nohup))?;
|
||||
} else {
|
||||
write_jobs(|j| j.disown(JobID::TableID(tabid), nohup))?;
|
||||
}
|
||||
if disown_all {
|
||||
write_jobs(|j| j.disown_all(nohup))?;
|
||||
} else {
|
||||
write_jobs(|j| j.disown(JobID::TableID(tabid), nohup))?;
|
||||
}
|
||||
|
||||
state::set_status(0);
|
||||
Ok(())
|
||||
state::set_status(0);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user