From 4e2b59f9df5085025f08faea24e76b009e47f68d Mon Sep 17 00:00:00 2001 From: Aaron O'Mullan Date: Sat, 25 Sep 2021 01:33:15 +0200 Subject: cleanup(runtime): flatten op_kill's args (#12214) --- runtime/js/40_process.js | 2 +- runtime/ops/process.rs | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'runtime') diff --git a/runtime/js/40_process.js b/runtime/js/40_process.js index 782dfe476..26d452a4d 100644 --- a/runtime/js/40_process.js +++ b/runtime/js/40_process.js @@ -15,7 +15,7 @@ } = window.__bootstrap.primordials; function opKill(pid, signo) { - core.opSync("op_kill", { pid, signo }); + core.opSync("op_kill", pid, signo); } function opRunStatus(rid) { diff --git a/runtime/ops/process.rs b/runtime/ops/process.rs index 581bd4bb2..1f7280d48 100644 --- a/runtime/ops/process.rs +++ b/runtime/ops/process.rs @@ -307,17 +307,15 @@ pub fn kill(pid: i32, signal: i32) -> Result<(), AnyError> { } } -#[derive(Deserialize)] -struct KillArgs { +fn op_kill( + state: &mut OpState, pid: i32, signo: String, -} - -fn op_kill(state: &mut OpState, args: KillArgs, _: ()) -> Result<(), AnyError> { +) -> Result<(), AnyError> { super::check_unstable(state, "Deno.kill"); state.borrow_mut::().run.check_all()?; - let signo = super::signal::signal_str_to_int(&args.signo)?; - kill(args.pid, signo)?; + let signo = super::signal::signal_str_to_int(&signo)?; + kill(pid, signo)?; Ok(()) } -- cgit v1.2.3