diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2020-09-10 09:57:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-10 09:57:45 -0400 |
commit | 7c2e7c660804afca823d60e6496aa853f75db16c (patch) | |
tree | b7746b181c1564c6b1abd2e906662f9e6b008417 /cli/ops/errors.rs | |
parent | 6f70e6e72ba2d5c1de7495adac37c1e4f4e86b24 (diff) |
Use gotham-like state for ops (#7385)
Provides a concrete state type that can be dynamically added. This is necessary for op crates.
* renames BasicState to OpState
* async ops take `Rc<RefCell<OpState>>`
* sync ops take `&mut OpState`
* removes `OpRegistry`, `OpRouter` traits
* `get_error_class_fn` moved to OpState
* ResourceTable moved to OpState
Diffstat (limited to 'cli/ops/errors.rs')
-rw-r--r-- | cli/ops/errors.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs index a4f4665e2..40ec1da30 100644 --- a/cli/ops/errors.rs +++ b/cli/ops/errors.rs @@ -3,18 +3,16 @@ use crate::diagnostics::Diagnostic; use crate::source_maps::get_orig_position; use crate::source_maps::CachedMaps; -use crate::state::State; use deno_core::ErrBox; -use deno_core::OpRegistry; +use deno_core::OpState; use deno_core::ZeroCopyBuf; use serde_derive::Deserialize; use serde_json::Value; use std::collections::HashMap; -use std::rc::Rc; -pub fn init(s: &Rc<State>) { - s.register_op_json_sync("op_apply_source_map", op_apply_source_map); - s.register_op_json_sync("op_format_diagnostic", op_format_diagnostic); +pub fn init(rt: &mut deno_core::JsRuntime) { + super::reg_json_sync(rt, "op_apply_source_map", op_apply_source_map); + super::reg_json_sync(rt, "op_format_diagnostic", op_format_diagnostic); } #[derive(Deserialize)] @@ -26,7 +24,7 @@ struct ApplySourceMap { } fn op_apply_source_map( - state: &State, + state: &mut OpState, args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { @@ -39,7 +37,7 @@ fn op_apply_source_map( args.line_number.into(), args.column_number.into(), &mut mappings_map, - &state.global_state.ts_compiler, + &super::cli_state(state).global_state.ts_compiler, ); Ok(json!({ @@ -50,7 +48,7 @@ fn op_apply_source_map( } fn op_format_diagnostic( - _state: &State, + _state: &mut OpState, args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, ErrBox> { |