From 9df917c0be620055c0d2eb53f76d4f1290d5e9e5 Mon Sep 17 00:00:00 2001 From: Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:08:10 -0800 Subject: chore: upgrade deno_core (#22725) --- runtime/js/40_tty.js | 9 ++++++--- runtime/ops/tty.rs | 13 +------------ 2 files changed, 7 insertions(+), 15 deletions(-) (limited to 'runtime') diff --git a/runtime/js/40_tty.js b/runtime/js/40_tty.js index dd364f18d..7cf1e4f5d 100644 --- a/runtime/js/40_tty.js +++ b/runtime/js/40_tty.js @@ -1,9 +1,12 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { internals, primordials } from "ext:core/mod.js"; -import { op_console_size, op_is_terminal } from "ext:core/ops"; +import { core, internals, primordials } from "ext:core/mod.js"; +import { op_console_size } from "ext:core/ops"; const { Uint32Array, } = primordials; +const { + isTerminal, +} = core; const size = new Uint32Array(2); @@ -18,7 +21,7 @@ function isatty(rid) { new Error().stack, "Use `Deno.stdin.isTerminal()`, `Deno.stdout.isTerminal()`, `Deno.stderr.isTerminal()` or `Deno.FsFile.isTerminal()` instead.", ); - return op_is_terminal(rid); + return isTerminal(rid); } export { consoleSize, isatty }; diff --git a/runtime/ops/tty.rs b/runtime/ops/tty.rs index e570754f2..3d721734c 100644 --- a/runtime/ops/tty.rs +++ b/runtime/ops/tty.rs @@ -50,12 +50,7 @@ use winapi::um::wincon; deno_core::extension!( deno_tty, - ops = [ - op_set_raw, - op_is_terminal, - op_console_size, - op_read_line_prompt - ], + ops = [op_set_raw, op_console_size, op_read_line_prompt], state = |state| { #[cfg(unix)] state.put(TtyModeStore::default()); @@ -209,12 +204,6 @@ fn op_set_raw( } } -#[op2(fast)] -fn op_is_terminal(state: &mut OpState, rid: u32) -> Result { - let handle = state.resource_table.get_handle(rid)?; - Ok(handle.is_terminal()) -} - #[op2(fast)] fn op_console_size( state: &mut OpState, -- cgit v1.2.3