diff options
Diffstat (limited to 'cli/ops/os.rs')
| -rw-r--r-- | cli/ops/os.rs | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/cli/ops/os.rs b/cli/ops/os.rs index 7a2a7155e..4778d49a4 100644 --- a/cli/ops/os.rs +++ b/cli/ops/os.rs @@ -1,32 +1,30 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use super::dispatch_json::{Deserialize, Value}; + use crate::state::State; -use deno_core::CoreIsolate; use deno_core::ErrBox; -use deno_core::ResourceTable; +use deno_core::OpRegistry; use deno_core::ZeroCopyBuf; +use serde_derive::Deserialize; +use serde_json::Value; use std::collections::HashMap; use std::env; use std::rc::Rc; use url::Url; -pub fn init(i: &mut CoreIsolate, s: &Rc<State>) { - let t = &CoreIsolate::state(i).borrow().resource_table.clone(); - - i.register_op("op_exit", s.stateful_json_op_sync(t, op_exit)); - i.register_op("op_env", s.stateful_json_op_sync(t, op_env)); - i.register_op("op_exec_path", s.stateful_json_op_sync(t, op_exec_path)); - i.register_op("op_set_env", s.stateful_json_op_sync(t, op_set_env)); - i.register_op("op_get_env", s.stateful_json_op_sync(t, op_get_env)); - i.register_op("op_delete_env", s.stateful_json_op_sync(t, op_delete_env)); - i.register_op("op_hostname", s.stateful_json_op_sync(t, op_hostname)); - i.register_op("op_loadavg", s.stateful_json_op_sync(t, op_loadavg)); - i.register_op("op_os_release", s.stateful_json_op_sync(t, op_os_release)); +pub fn init(s: &Rc<State>) { + s.register_op_json_sync("op_exit", op_exit); + s.register_op_json_sync("op_env", op_env); + s.register_op_json_sync("op_exec_path", op_exec_path); + s.register_op_json_sync("op_set_env", op_set_env); + s.register_op_json_sync("op_get_env", op_get_env); + s.register_op_json_sync("op_delete_env", op_delete_env); + s.register_op_json_sync("op_hostname", op_hostname); + s.register_op_json_sync("op_loadavg", op_loadavg); + s.register_op_json_sync("op_os_release", op_os_release); } fn op_exec_path( state: &State, - _resource_table: &mut ResourceTable, _args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -47,7 +45,6 @@ struct SetEnv { fn op_set_env( state: &State, - _resource_table: &mut ResourceTable, args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -59,7 +56,6 @@ fn op_set_env( fn op_env( state: &State, - _resource_table: &mut ResourceTable, _args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -75,7 +71,6 @@ struct GetEnv { fn op_get_env( state: &State, - _resource_table: &mut ResourceTable, args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -95,7 +90,6 @@ struct DeleteEnv { fn op_delete_env( state: &State, - _resource_table: &mut ResourceTable, args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -112,7 +106,6 @@ struct Exit { fn op_exit( _state: &State, - _resource_table: &mut ResourceTable, args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -122,7 +115,6 @@ fn op_exit( fn op_loadavg( state: &State, - _resource_table: &mut ResourceTable, _args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -136,7 +128,6 @@ fn op_loadavg( fn op_hostname( state: &State, - _resource_table: &mut ResourceTable, _args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -148,7 +139,6 @@ fn op_hostname( fn op_os_release( state: &State, - _resource_table: &mut ResourceTable, _args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { |