vinc
/
moros
mirror of https://github.com/vinc/moros.git
1
5
Fork 0
Code Issues Projects Releases Wiki Activity

Run clippy (#581)

This commit is contained in:
Vincent Ollivier 2024-02-18 21:34:32 +01:00 committed by GitHub
parent 6c8ffb2c98
commit 5e92dcb2d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/usr/lisp/primitive.rs
View File

@ -419,7 +419,7 @@ pub fn lisp_regex_find(args: &[Exp]) -> Result<Exp, Err> {
(Exp::Str(regex), Exp::Str(s)) => {
let res = Regex::new(regex).find(s).map(|(a, b)|
vec![Exp::Num(Number::from(a)), Exp::Num(Number::from(b))]
).unwrap_or(vec![]);
).unwrap_or_default();
Ok(Exp::List(res))
}
_ => expected!("arguments to be a regex and a string"),

90
src/usr/shell.rs
View File

@ -517,52 +517,52 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> Result<(), ExitCode> {
fn dispatch(args: &[&str], config: &mut Config) -> Result<(), ExitCode> {
match args[0] {
"" => Ok(()),
"2048" => usr::pow::main(&args),
"alias" => cmd_alias(&args, config),
"base64" => usr::base64::main(&args),
"beep" => usr::beep::main(&args),
"calc" => usr::calc::main(&args),
"chess" => usr::chess::main(&args),
"copy" => usr::copy::main(&args),
"date" => usr::date::main(&args),
"delete" => usr::delete::main(&args),
"dhcp" => usr::dhcp::main(&args),
"disk" => usr::disk::main(&args),
"edit" => usr::editor::main(&args),
"elf" => usr::elf::main(&args),
"env" => usr::env::main(&args),
"find" => usr::find::main(&args),
"goto" => cmd_change_dir(&args, config), // TODO: Remove this
"hash" => usr::hash::main(&args),
"help" => usr::help::main(&args),
"hex" => usr::hex::main(&args),
"host" => usr::host::main(&args),
"http" => usr::http::main(&args),
"httpd" => usr::httpd::main(&args),
"install" => usr::install::main(&args),
"keyboard" => usr::keyboard::main(&args),
"life" => usr::life::main(&args),
"lisp" => usr::lisp::main(&args),
"list" => usr::list::main(&args),
"2048" => usr::pow::main(args),
"alias" => cmd_alias(args, config),
"base64" => usr::base64::main(args),
"beep" => usr::beep::main(args),
"calc" => usr::calc::main(args),
"chess" => usr::chess::main(args),
"copy" => usr::copy::main(args),
"date" => usr::date::main(args),
"delete" => usr::delete::main(args),
"dhcp" => usr::dhcp::main(args),
"disk" => usr::disk::main(args),
"edit" => usr::editor::main(args),
"elf" => usr::elf::main(args),
"env" => usr::env::main(args),
"find" => usr::find::main(args),
"goto" => cmd_change_dir(args, config), // TODO: Remove this
"hash" => usr::hash::main(args),
"help" => usr::help::main(args),
"hex" => usr::hex::main(args),
"host" => usr::host::main(args),
"http" => usr::http::main(args),
"httpd" => usr::httpd::main(args),
"install" => usr::install::main(args),
"keyboard" => usr::keyboard::main(args),
"life" => usr::life::main(args),
"lisp" => usr::lisp::main(args),
"list" => usr::list::main(args),
"logs" => cmd_logs(),
"memory" => usr::memory::main(&args),
"move" => usr::r#move::main(&args),
"net" => usr::net::main(&args),
"pci" => usr::pci::main(&args),
"pi" => usr::pi::main(&args),
"memory" => usr::memory::main(args),
"move" => usr::r#move::main(args),
"net" => usr::net::main(args),
"pci" => usr::pci::main(args),
"pi" => usr::pi::main(args),
"quit" => Err(ExitCode::ShellExit),
"read" => usr::read::main(&args),
"set" => cmd_set(&args, config),
"shell" => usr::shell::main(&args),
"socket" => usr::socket::main(&args),
"tcp" => usr::tcp::main(&args),
"time" => usr::time::main(&args),
"unalias" => cmd_unalias(&args, config),
"unset" => cmd_unset(&args, config),
"read" => usr::read::main(args),
"set" => cmd_set(args, config),
"shell" => usr::shell::main(args),
"socket" => usr::socket::main(args),
"tcp" => usr::tcp::main(args),
"time" => usr::time::main(args),
"unalias" => cmd_unalias(args, config),
"unset" => cmd_unset(args, config),
"version" => cmd_version(),
"user" => usr::user::main(&args),
"vga" => usr::vga::main(&args),
"write" => usr::write::main(&args),
"user" => usr::user::main(args),
"vga" => usr::vga::main(args),
"write" => usr::write::main(args),
"panic" => panic!("{}", args[1..].join(" ")),
_ => {
let mut path = fs::realpath(args[0]);
@ -575,10 +575,10 @@ fn dispatch(args: &[&str], config: &mut Config) -> Result<(), ExitCode> {
config.env.insert("DIR".to_string(), sys::process::dir());
Ok(())
}
Some(FileType::File) => spawn(&path, &args, config),
Some(FileType::File) => spawn(&path, args, config),
_ => {
let path = format!("/bin/{}", args[0]);
spawn(&path, &args, config)
spawn(&path, args, config)
}
}
}