pagedmov/shed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ran the codebase through rustfmt

Browse Source
This commit is contained in:
pagedmov
2026-02-23 23:32:46 -05:00
parent fa49e2ef70
commit cf46303659
27 changed files with 254 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/builtin/alias.rs
View File

@@ -3,7 +3,7 @@ use crate::{
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state::{self, read_logic, write_logic},
};

4
src/builtin/echo.rs
View File

@@ -3,12 +3,12 @@ use std::sync::LazyLock;
use crate::{
builtin::setup_builtin,
expand::expand_prompt,
getopt::{Opt, OptSpec, get_opts_from_tokens},
getopt::{get_opts_from_tokens, Opt, OptSpec},
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult, ShResultExt},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state,
};

13
src/builtin/eval.rs
View File

@@ -4,7 +4,7 @@ use crate::{
builtin::setup_builtin,
jobs::JobBldr,
libsh::error::ShResult,
parse::{NdRule, Node, execute::exec_input},
parse::{execute::exec_input, NdRule, Node},
procio::IoStack,
state,
};
@@ -25,10 +25,11 @@ pub fn eval(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<(
return Ok(());
}
let joined_argv = expanded_argv.into_iter()
.map(|(s, _)| s)
.collect::<Vec<_>>()
.join(" ");
let joined_argv = expanded_argv
.into_iter()
.map(|(s, _)| s)
.collect::<Vec<_>>()
.join(" ");
exec_input(joined_argv, None, false)
exec_input(joined_argv, None, false)
}

10
src/builtin/exec.rs
View File

@@ -4,7 +4,7 @@ use crate::{
builtin::setup_builtin,
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node, execute::ExecArgs},
parse::{execute::ExecArgs, NdRule, Node},
procio::IoStack,
state,
};
@@ -40,11 +40,7 @@ pub fn exec_builtin(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> Sh
// execvpe only returns on error
let cmd_str = cmd.to_str().unwrap().to_string();
match e {
Errno::ENOENT => {
Err(ShErr::full(ShErrKind::CmdNotFound(cmd_str), "", span))
}
_ => {
Err(ShErr::full(ShErrKind::Errno(e), format!("{e}"), span))
}
Errno::ENOENT => Err(ShErr::full(ShErrKind::CmdNotFound(cmd_str), "", span)),
_ => Err(ShErr::full(ShErrKind::Errno(e), format!("{e}"), span)),
}
}

29
src/builtin/export.rs
View File

@@ -3,8 +3,8 @@ use crate::{
libsh::error::ShResult,
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
state::{self, VarFlags, read_vars, write_vars},
procio::{borrow_fd, IoStack},
state::{self, read_vars, write_vars, VarFlags},
};
use super::setup_builtin;
@@ -35,10 +35,10 @@ pub fn export(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult
for (arg, _) in argv {
if let Some((var, val)) = arg.split_once('=') {
write_vars(|v| v.set_var(var, val, VarFlags::EXPORT)); // Export an assignment like
// 'foo=bar'
// 'foo=bar'
} else {
write_vars(|v| v.export_var(&arg)); // Export an existing variable, if
// any
// any
}
}
}
@@ -59,16 +59,17 @@ pub fn local(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<
if argv.is_empty() {
// Display the local variables
let vars_output = read_vars(|v| {
let mut vars = v.flatten_vars()
.into_iter()
.map(|(k, v)| format!("{}={}", k, v))
.collect::<Vec<String>>();
vars.sort();
let mut vars_joined = vars.join("\n");
vars_joined.push('\n');
vars_joined
});
let vars_output = read_vars(|v| {
let mut vars = v
.flatten_vars()
.into_iter()
.map(|(k, v)| format!("{}={}", k, v))
.collect::<Vec<String>>();
vars.sort();
let mut vars_joined = vars.join("\n");
vars_joined.push('\n');
vars_joined
});
let stdout = borrow_fd(STDOUT_FILENO);
write(stdout, vars_output.as_bytes())?; // Write it

2
src/builtin/flowctl.rs
View File

@@ -1,6 +1,6 @@
use crate::{
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node, execute::prepare_argv},
parse::{execute::prepare_argv, NdRule, Node},
prelude::*,
};

48
src/builtin/jobctl.rs
View File

@@ -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(())
}

2
src/builtin/pwd.rs
View File

@@ -3,7 +3,7 @@ use crate::{
libsh::error::ShResult,
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state,
};

6
src/builtin/read.rs
View File

@@ -7,13 +7,13 @@ use nix::{
use crate::{
builtin::setup_builtin,
getopt::{Opt, OptSpec, get_opts_from_tokens},
getopt::{get_opts_from_tokens, Opt, OptSpec},
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult, ShResultExt},
parse::{NdRule, Node},
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
prompt::readline::term::RawModeGuard,
state::{self, VarFlags, read_vars, write_vars},
state::{self, read_vars, write_vars, VarFlags},
};
pub const READ_OPTS: [OptSpec; 7] = [

2
src/builtin/shopt.rs
View File

@@ -3,7 +3,7 @@ use crate::{
libsh::error::{ShResult, ShResultExt},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state::write_shopts,
};

2
src/builtin/test.rs
View File

@@ -8,7 +8,7 @@ use regex::Regex;
use crate::{
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{ConjunctOp, NdRule, Node, TEST_UNARY_OPS, TestCase},
parse::{ConjunctOp, NdRule, Node, TestCase, TEST_UNARY_OPS},
prelude::*,
};

2
src/builtin/trap.rs
View File

@@ -11,7 +11,7 @@ use crate::{
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node},
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state::{self, read_logic, write_logic},
};

4
src/builtin/zoltraak.rs
View File

@@ -1,12 +1,12 @@
use std::{os::unix::fs::OpenOptionsExt, sync::LazyLock};
use crate::{
getopt::{Opt, OptSet, OptSpec, get_opts_from_tokens},
getopt::{get_opts_from_tokens, Opt, OptSet, OptSpec},
jobs::JobBldr,
libsh::error::{Note, ShErr, ShErrKind, ShResult, ShResultExt},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
};
use super::setup_builtin;