Run rustfmt +nightly **/*.rs and rebase

This commit is contained in:
sxyazi 2024-10-26 17:45:33 +08:00
parent bb887f9230
commit 87d63dc273
No known key found for this signature in database

View file

@ -1,7 +1,8 @@
use std::process::Stdio; use std::{ffi::OsString, process::Stdio};
use std::ffi::OsString;
use mlua::{AnyUserData, ExternalError, IntoLuaMulti, Lua, Table, UserData, Value}; use mlua::{AnyUserData, ExternalError, IntoLuaMulti, Lua, Table, UserData, Value};
use tokio::process::{ChildStderr, ChildStdin, ChildStdout}; use tokio::process::{ChildStderr, ChildStdin, ChildStdout};
use super::{Child, output::Output}; use super::{Child, output::Output};
use crate::process::Status; use crate::process::Status;
@ -17,18 +18,12 @@ impl Command {
pub fn install(lua: &Lua) -> mlua::Result<()> { pub fn install(lua: &Lua) -> mlua::Result<()> {
let new = lua.create_function(|_, (_, program): (Table, String)| { let new = lua.create_function(|_, (_, program): (Table, String)| {
let mut inner = tokio::process::Command::new(program); let mut inner = tokio::process::Command::new(program);
inner.kill_on_drop(true) inner.kill_on_drop(true).stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null());
.stdin(Stdio::null())
.stdout(Stdio::null())
.stderr(Stdio::null());
Ok(Self { inner }) Ok(Self { inner })
})?; })?;
let command = lua.create_table_from([ let command =
("NULL", NULL), lua.create_table_from([("NULL", NULL), ("PIPED", PIPED), ("INHERIT", INHERIT)])?;
("PIPED", PIPED),
("INHERIT", INHERIT),
])?;
command.set_metatable(Some(lua.create_table_from([("__call", new)])?)); command.set_metatable(Some(lua.create_table_from([("__call", new)])?));
lua.globals().raw_set("Command", command) lua.globals().raw_set("Command", command)
@ -70,10 +65,8 @@ impl UserData for Command {
}); });
methods.add_function_mut("args", |_, (ud, args): (AnyUserData, Vec<mlua::String>)| { methods.add_function_mut("args", |_, (ud, args): (AnyUserData, Vec<mlua::String>)| {
let args: Vec<OsString> = args let args: Vec<OsString> =
.iter() args.iter().map(|arg| OsString::from(arg.to_str().unwrap())).collect();
.map(|arg| OsString::from(arg.to_str().unwrap()))
.collect();
ud.borrow_mut::<Self>()?.inner.args(&args); ud.borrow_mut::<Self>()?.inner.args(&args);
Ok(ud) Ok(ud)
}); });