diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2020-02-08 20:34:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-08 20:34:31 +0100 |
commit | cdba5ab6fc633606aaa6f95d0825832c3ac6fe5c (patch) | |
tree | e8dee2801e14b65b2da6aca62e39cd3d3ac2a786 /cli/ops/errors.rs | |
parent | 619a24390ff15d5ea5e577a4d0391823f94e8592 (diff) |
refactor: rename ThreadSafeState, use RefCell for mutable state (#3931)
* rename ThreadSafeState to State
* State stores InnerState wrapped in Rc and RefCell
Diffstat (limited to 'cli/ops/errors.rs')
-rw-r--r-- | cli/ops/errors.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs index 14edf9cee..af0d7c93d 100644 --- a/cli/ops/errors.rs +++ b/cli/ops/errors.rs @@ -4,11 +4,11 @@ use crate::fmt_errors::JSError; use crate::ops::json_op; use crate::source_maps::get_orig_position; use crate::source_maps::CachedMaps; -use crate::state::ThreadSafeState; +use crate::state::State; use deno_core::*; use std::collections::HashMap; -pub fn init(i: &mut Isolate, s: &ThreadSafeState) { +pub fn init(i: &mut Isolate, s: &State) { i.register_op( "apply_source_map", s.core_op(json_op(s.stateful_op(op_apply_source_map))), @@ -25,12 +25,13 @@ struct FormatErrorArgs { } fn op_format_error( - state: &ThreadSafeState, + state: &State, args: Value, _zero_copy: Option<ZeroCopyBuf>, ) -> Result<JsonOp, ErrBox> { let args: FormatErrorArgs = serde_json::from_value(args)?; - let error = JSError::from_json(&args.error, &state.global_state.ts_compiler); + let error = + JSError::from_json(&args.error, &state.borrow().global_state.ts_compiler); Ok(JsonOp::Sync(json!({ "error": error.to_string(), @@ -45,7 +46,7 @@ struct ApplySourceMap { } fn op_apply_source_map( - state: &ThreadSafeState, + state: &State, args: Value, _zero_copy: Option<ZeroCopyBuf>, ) -> Result<JsonOp, ErrBox> { @@ -57,7 +58,7 @@ fn op_apply_source_map( args.line.into(), args.column.into(), &mut mappings_map, - &state.global_state.ts_compiler, + &state.borrow().global_state.ts_compiler, ); Ok(JsonOp::Sync(json!({ |