diff options
author | Bert Belder <bertbelder@gmail.com> | 2019-07-11 00:53:48 +0200 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2019-07-11 14:37:00 -0400 |
commit | abe8a113ad8004f160eac5f3f115cb28c5072ba7 (patch) | |
tree | 099b2b019bd7b5d1689cfa5b4bef3ceded10c59d /cli/signal.rs | |
parent | db5c66a638d399d5ebb2832bb7b52e8f76ced49d (diff) |
Refactor error to use dynamic dispatch and traits
This is in preperation for dynamic import (#1789), which is more easily
implemented when errors are dynamic.
Diffstat (limited to 'cli/signal.rs')
-rw-r--r-- | cli/signal.rs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cli/signal.rs b/cli/signal.rs index bedb43ad2..22aa90be3 100644 --- a/cli/signal.rs +++ b/cli/signal.rs @@ -1,19 +1,15 @@ -#[cfg(unix)] -use nix::sys::signal::{kill as unix_kill, Signal}; -#[cfg(unix)] -use nix::unistd::Pid; - -use crate::deno_error::DenoResult; +use deno::ErrBox; #[cfg(unix)] -pub fn kill(pid: i32, signo: i32) -> DenoResult<()> { - use crate::deno_error::DenoError; +pub fn kill(pid: i32, signo: i32) -> Result<(), ErrBox> { + use nix::sys::signal::{kill as unix_kill, Signal}; + use nix::unistd::Pid; let sig = Signal::from_c_int(signo)?; - unix_kill(Pid::from_raw(pid), Option::Some(sig)).map_err(DenoError::from) + unix_kill(Pid::from_raw(pid), Option::Some(sig)).map_err(ErrBox::from) } #[cfg(not(unix))] -pub fn kill(_pid: i32, _signal: i32) -> DenoResult<()> { +pub fn kill(_pid: i32, _signal: i32) -> Result<(), ErrBox> { // NOOP // TODO: implement this for windows Ok(()) |