summaryrefslogtreecommitdiff
path: root/cli/ops/repl.rs
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-11-13 23:14:48 -0500
committerRy Dahl <ry@tinyclouds.org>2019-11-13 23:42:35 -0500
commitfdf0ede2acd110ba04857d5674db19c908b3ff32 (patch)
tree880252cadf6dd5024fe4d32dca7ab903af55e713 /cli/ops/repl.rs
parentfd62379eafde6571f126df5650b80cfda9f74229 (diff)
Revert "refactor: per-worker resource table (#3306)"
This patch does not work with the recent bundler changes (#3325). Unfortunately I didn't merge master before landing this patch. It has something to do with console.log not working inside the compiler worker. This reverts commit fd62379eafde6571f126df5650b80cfda9f74229.
Diffstat (limited to 'cli/ops/repl.rs')
-rw-r--r--cli/ops/repl.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs
index 5919ea586..723fb2571 100644
--- a/cli/ops/repl.rs
+++ b/cli/ops/repl.rs
@@ -4,8 +4,9 @@ use crate::deno_error::bad_resource;
use crate::ops::json_op;
use crate::repl;
use crate::repl::Repl;
+use crate::resources;
+use crate::resources::Resource;
use crate::state::ThreadSafeState;
-use deno::Resource;
use deno::*;
use std::sync::Arc;
use std::sync::Mutex;
@@ -43,7 +44,7 @@ fn op_repl_start(
repl::history_path(&state.global_state.dir, &args.history_file);
let repl = repl::Repl::new(history_path);
let resource = ReplResource(Arc::new(Mutex::new(repl)));
- let mut table = state.lock_resource_table();
+ let mut table = resources::lock_resource_table();
let rid = table.add("repl", Box::new(resource));
Ok(JsonOp::Sync(json!(rid)))
}
@@ -55,7 +56,7 @@ struct ReplReadlineArgs {
}
fn op_repl_readline(
- state: &ThreadSafeState,
+ _state: &ThreadSafeState,
args: Value,
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
@@ -63,10 +64,9 @@ fn op_repl_readline(
let rid = args.rid as u32;
let prompt = args.prompt;
debug!("op_repl_readline {} {}", rid, prompt);
- let state = state.clone();
blocking_json(false, move || {
- let table = state.lock_resource_table();
+ let table = resources::lock_resource_table();
let resource = table.get::<ReplResource>(rid).ok_or_else(bad_resource)?;
let repl = resource.0.clone();
let line = repl.lock().unwrap().readline(&prompt)?;