From 4e1abb4f3a1fbdac25b1e7db0588572e4d5a6579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sun, 23 Feb 2020 14:51:29 -0500 Subject: refactor: use OpError instead of ErrBox for errors in ops (#4058) To better reflect changes in error types in JS from #3662 this PR changes default error type used in ops from "ErrBox" to "OpError". "OpError" is a type that can be sent over to JSON; it has all information needed to construct error in JavaScript. That made "GetErrorKind" trait useless and so it was removed altogether. To provide compatibility with previous use of "ErrBox" an implementation of "From for OpError" was added, however, it is an escape hatch and ops implementors should strive to use "OpError" directly. --- cli/signal.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cli/signal.rs') diff --git a/cli/signal.rs b/cli/signal.rs index 6f150aeab..d7e9985b5 100644 --- a/cli/signal.rs +++ b/cli/signal.rs @@ -1,16 +1,16 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use deno_core::ErrBox; +use crate::op_error::OpError; #[cfg(unix)] -pub fn kill(pid: i32, signo: i32) -> Result<(), ErrBox> { +pub fn kill(pid: i32, signo: i32) -> Result<(), OpError> { 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(ErrBox::from) + unix_kill(Pid::from_raw(pid), Option::Some(sig)).map_err(OpError::from) } #[cfg(not(unix))] -pub fn kill(_pid: i32, _signal: i32) -> Result<(), ErrBox> { +pub fn kill(_pid: i32, _signal: i32) -> Result<(), OpError> { // NOOP // TODO: implement this for windows Ok(()) -- cgit v1.2.3