diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/flash/lib.rs | 8 | ||||
| -rw-r--r-- | ext/net/lib.rs | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ext/flash/lib.rs b/ext/flash/lib.rs index abd8502d0..92350db58 100644 --- a/ext/flash/lib.rs +++ b/ext/flash/lib.rs @@ -1344,8 +1344,8 @@ async fn op_flash_next_async( // the ContextScope creation is optimized away and the op is as simple as: // f(info: *const v8::FunctionCallbackInfo) { let rv = ...; rv.set_uint32(op_flash_next()); } #[op] -fn op_flash_next(op_state: &mut OpState) -> u32 { - let flash_ctx = op_state.borrow_mut::<FlashContext>(); +fn op_flash_next(state: &mut OpState) -> u32 { + let flash_ctx = state.borrow_mut::<FlashContext>(); let ctx = flash_ctx.servers.get_mut(&0).unwrap(); next_request_sync(ctx) } @@ -1353,8 +1353,8 @@ fn op_flash_next(op_state: &mut OpState) -> u32 { // Syncrhonous version of op_flash_next_async. Under heavy load, // this can collect buffered requests from rx channel and return tokens in a single batch. #[op] -fn op_flash_next_server(op_state: &mut OpState, server_id: u32) -> u32 { - let flash_ctx = op_state.borrow_mut::<FlashContext>(); +fn op_flash_next_server(state: &mut OpState, server_id: u32) -> u32 { + let flash_ctx = state.borrow_mut::<FlashContext>(); let ctx = flash_ctx.servers.get_mut(&server_id).unwrap(); next_request_sync(ctx) } diff --git a/ext/net/lib.rs b/ext/net/lib.rs index c95348020..249170060 100644 --- a/ext/net/lib.rs +++ b/ext/net/lib.rs @@ -81,6 +81,8 @@ pub fn init<P: NetPermissions + 'static>( unstable: bool, unsafely_ignore_certificate_errors: Option<Vec<String>>, ) -> Extension { + let mut ops = ops::init::<P>(); + ops.extend(ops_tls::init::<P>()); Extension::builder() .js(include_js_files!( prefix "deno:ext/net", @@ -88,7 +90,7 @@ pub fn init<P: NetPermissions + 'static>( "02_tls.js", "04_net_unstable.js", )) - .ops([&ops::init::<P>()[..], &ops_tls::init::<P>()[..]].concat()) + .ops(ops) .state(move |state| { state.put(DefaultTlsOptions { root_cert_store: root_cert_store.clone(), |