summaryrefslogtreecommitdiff
path: root/cli/ops/tty.rs
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2020-05-29 17:41:39 -0400
committerGitHub <noreply@github.com>2020-05-29 17:41:39 -0400
commitd4b05dd89e94ed1bba5b24c683da0a895f2ce597 (patch)
tree7e098257f5558a624e1d691f92c4d6d4cef56667 /cli/ops/tty.rs
parent106b00173806e088472e123d04fdc8d260c3820d (diff)
refactor: Split isolate and state using safe get_slot() (#5929)
Diffstat (limited to 'cli/ops/tty.rs')
-rw-r--r--cli/ops/tty.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/cli/ops/tty.rs b/cli/ops/tty.rs
index cf7f62ed8..00a5870e9 100644
--- a/cli/ops/tty.rs
+++ b/cli/ops/tty.rs
@@ -4,6 +4,7 @@ use super::io::{StreamResource, StreamResourceHolder};
use crate::op_error::OpError;
use crate::state::State;
use deno_core::CoreIsolate;
+use deno_core::CoreIsolateState;
use deno_core::ZeroCopyBuf;
#[cfg(unix)]
use nix::sys::termios;
@@ -46,7 +47,7 @@ struct SetRawArgs {
}
pub fn op_set_raw(
- isolate: &mut CoreIsolate,
+ isolate_state: &mut CoreIsolateState,
state: &State,
args: Value,
_zero_copy: Option<ZeroCopyBuf>,
@@ -67,7 +68,7 @@ pub fn op_set_raw(
use winapi::shared::minwindef::FALSE;
use winapi::um::{consoleapi, handleapi};
- let mut resource_table = isolate.resource_table.borrow_mut();
+ let mut resource_table = isolate_state.resource_table.borrow_mut();
let resource_holder = resource_table.get_mut::<StreamResourceHolder>(rid);
if resource_holder.is_none() {
return Err(OpError::bad_resource_id());
@@ -133,7 +134,7 @@ pub fn op_set_raw(
{
use std::os::unix::io::AsRawFd;
- let mut resource_table = isolate.resource_table.borrow_mut();
+ let mut resource_table = isolate_state.resource_table.borrow_mut();
let resource_holder = resource_table.get_mut::<StreamResourceHolder>(rid);
if resource_holder.is_none() {
return Err(OpError::bad_resource_id());
@@ -215,7 +216,7 @@ struct IsattyArgs {
}
pub fn op_isatty(
- isolate: &mut CoreIsolate,
+ isolate_state: &mut CoreIsolateState,
_state: &State,
args: Value,
_zero_copy: Option<ZeroCopyBuf>,
@@ -223,7 +224,7 @@ pub fn op_isatty(
let args: IsattyArgs = serde_json::from_value(args)?;
let rid = args.rid;
- let mut resource_table = isolate.resource_table.borrow_mut();
+ let mut resource_table = isolate_state.resource_table.borrow_mut();
let isatty: bool =
std_file_resource(&mut resource_table, rid as u32, move |r| match r {
Ok(std_file) => {