diff options
Diffstat (limited to 'cli/ops/signal.rs')
-rw-r--r-- | cli/ops/signal.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cli/ops/signal.rs b/cli/ops/signal.rs index 37d1ca914..c1917945e 100644 --- a/cli/ops/signal.rs +++ b/cli/ops/signal.rs @@ -1,7 +1,7 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +use deno_core::error::AnyError; use deno_core::BufVec; -use deno_core::ErrBox; use deno_core::OpState; use deno_core::ZeroCopyBuf; use serde_json::Value; @@ -9,6 +9,8 @@ use std::cell::RefCell; use std::rc::Rc; #[cfg(unix)] +use deno_core::error::bad_resource_id; +#[cfg(unix)] use futures::future::poll_fn; #[cfg(unix)] use serde_derive::Deserialize; @@ -45,7 +47,7 @@ fn op_signal_bind( state: &mut OpState, args: Value, _zero_copy: &mut [ZeroCopyBuf], -) -> Result<Value, ErrBox> { +) -> Result<Value, AnyError> { super::cli_state(state).check_unstable("Deno.signal"); let args: BindSignalArgs = serde_json::from_value(args)?; let rid = state.resource_table.add( @@ -65,7 +67,7 @@ async fn op_signal_poll( state: Rc<RefCell<OpState>>, args: Value, _zero_copy: BufVec, -) -> Result<Value, ErrBox> { +) -> Result<Value, AnyError> { super::cli_state2(&state).check_unstable("Deno.signal"); let args: SignalArgs = serde_json::from_value(args)?; let rid = args.rid as u32; @@ -89,7 +91,7 @@ pub fn op_signal_unbind( state: &mut OpState, args: Value, _zero_copy: &mut [ZeroCopyBuf], -) -> Result<Value, ErrBox> { +) -> Result<Value, AnyError> { super::cli_state(state).check_unstable("Deno.signal"); let args: SignalArgs = serde_json::from_value(args)?; let rid = args.rid as u32; @@ -104,7 +106,7 @@ pub fn op_signal_unbind( state .resource_table .close(rid) - .ok_or_else(ErrBox::bad_resource_id)?; + .ok_or_else(bad_resource_id)?; Ok(json!({})) } @@ -113,7 +115,7 @@ pub fn op_signal_bind( _state: &mut OpState, _args: Value, _zero_copy: &mut [ZeroCopyBuf], -) -> Result<Value, ErrBox> { +) -> Result<Value, AnyError> { unimplemented!(); } @@ -122,7 +124,7 @@ fn op_signal_unbind( _state: &mut OpState, _args: Value, _zero_copy: &mut [ZeroCopyBuf], -) -> Result<Value, ErrBox> { +) -> Result<Value, AnyError> { unimplemented!(); } @@ -131,6 +133,6 @@ async fn op_signal_poll( _state: Rc<RefCell<OpState>>, _args: Value, _zero_copy: BufVec, -) -> Result<Value, ErrBox> { +) -> Result<Value, AnyError> { unimplemented!(); } |