From cdba5ab6fc633606aaa6f95d0825832c3ac6fe5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sat, 8 Feb 2020 20:34:31 +0100 Subject: refactor: rename ThreadSafeState, use RefCell for mutable state (#3931) * rename ThreadSafeState to State * State stores InnerState wrapped in Rc and RefCell --- cli/compilers/compiler_worker.rs | 8 ++------ cli/compilers/ts.rs | 5 ++--- cli/compilers/wasm.rs | 5 ++--- 3 files changed, 6 insertions(+), 12 deletions(-) (limited to 'cli/compilers') diff --git a/cli/compilers/compiler_worker.rs b/cli/compilers/compiler_worker.rs index f76395e75..3252aae02 100644 --- a/cli/compilers/compiler_worker.rs +++ b/cli/compilers/compiler_worker.rs @@ -1,6 +1,6 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. use crate::ops; -use crate::state::ThreadSafeState; +use crate::state::State; use crate::worker::Worker; use deno_core; use deno_core::StartupData; @@ -23,11 +23,7 @@ use std::ops::DerefMut; pub struct CompilerWorker(Worker); impl CompilerWorker { - pub fn new( - name: String, - startup_data: StartupData, - state: ThreadSafeState, - ) -> Self { + pub fn new(name: String, startup_data: StartupData, state: State) -> Self { let state_ = state.clone(); let mut worker = Worker::new(name, startup_data, state_); { diff --git a/cli/compilers/ts.rs b/cli/compilers/ts.rs index 303c24b6a..91c264345 100644 --- a/cli/compilers/ts.rs +++ b/cli/compilers/ts.rs @@ -249,9 +249,8 @@ impl TsCompiler { fn setup_worker(global_state: GlobalState) -> CompilerWorker { let entry_point = ModuleSpecifier::resolve_url_or_path("./__$deno$ts_compiler.ts").unwrap(); - let worker_state = - ThreadSafeState::new(global_state.clone(), None, entry_point) - .expect("Unable to create worker state"); + let worker_state = State::new(global_state.clone(), None, entry_point) + .expect("Unable to create worker state"); // Count how many times we start the compiler worker. global_state diff --git a/cli/compilers/wasm.rs b/cli/compilers/wasm.rs index 6b8da100a..c1c179f62 100644 --- a/cli/compilers/wasm.rs +++ b/cli/compilers/wasm.rs @@ -52,9 +52,8 @@ impl WasmCompiler { let entry_point = ModuleSpecifier::resolve_url_or_path("./__$deno$wasm_compiler.ts") .unwrap(); - let worker_state = - ThreadSafeState::new(global_state.clone(), None, entry_point) - .expect("Unable to create worker state"); + let worker_state = State::new(global_state.clone(), None, entry_point) + .expect("Unable to create worker state"); // Count how many times we start the compiler worker. global_state -- cgit v1.2.3