summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/fs/30_fs.js8
-rw-r--r--ext/net/01_net.js4
-rw-r--r--ext/web/lib.rs16
3 files changed, 6 insertions, 22 deletions
diff --git a/ext/fs/30_fs.js b/ext/fs/30_fs.js
index aa7f345e5..46358c42a 100644
--- a/ext/fs/30_fs.js
+++ b/ext/fs/30_fs.js
@@ -4,9 +4,9 @@ import { core, internals, primordials } from "ext:core/mod.js";
const {
isDate,
internalRidSymbol,
+ createCancelHandle,
} = core;
import {
- op_cancel_handle,
op_fs_chdir,
op_fs_chmod_async,
op_fs_chmod_sync,
@@ -823,7 +823,7 @@ async function readFile(path, options) {
let abortHandler;
if (options?.signal) {
options.signal.throwIfAborted();
- cancelRid = op_cancel_handle();
+ cancelRid = createCancelHandle();
abortHandler = () => core.tryClose(cancelRid);
options.signal[abortSignal.add](abortHandler);
}
@@ -853,7 +853,7 @@ async function readTextFile(path, options) {
let abortHandler;
if (options?.signal) {
options.signal.throwIfAborted();
- cancelRid = op_cancel_handle();
+ cancelRid = createCancelHandle();
abortHandler = () => core.tryClose(cancelRid);
options.signal[abortSignal.add](abortHandler);
}
@@ -899,7 +899,7 @@ async function writeFile(
let abortHandler;
if (options.signal) {
options.signal.throwIfAborted();
- cancelRid = op_cancel_handle();
+ cancelRid = createCancelHandle();
abortHandler = () => core.tryClose(cancelRid);
options.signal[abortSignal.add](abortHandler);
}
diff --git a/ext/net/01_net.js b/ext/net/01_net.js
index 1523f5aa5..50f4971f5 100644
--- a/ext/net/01_net.js
+++ b/ext/net/01_net.js
@@ -5,9 +5,9 @@ const {
BadResourcePrototype,
InterruptedPrototype,
internalRidSymbol,
+ createCancelHandle,
} = core;
import {
- op_cancel_handle,
op_dns_resolve,
op_net_accept_tcp,
op_net_accept_unix,
@@ -67,7 +67,7 @@ async function resolveDns(query, recordType, options) {
let abortHandler;
if (options?.signal) {
options.signal.throwIfAborted();
- cancelRid = op_cancel_handle();
+ cancelRid = createCancelHandle();
abortHandler = () => core.tryClose(cancelRid);
options.signal[abortSignal.add](abortHandler);
}
diff --git a/ext/web/lib.rs b/ext/web/lib.rs
index acac78f56..3defbd74e 100644
--- a/ext/web/lib.rs
+++ b/ext/web/lib.rs
@@ -14,7 +14,6 @@ use deno_core::op2;
use deno_core::url::Url;
use deno_core::v8;
use deno_core::ByteString;
-use deno_core::CancelHandle;
use deno_core::OpState;
use deno_core::Resource;
use deno_core::ResourceId;
@@ -71,7 +70,6 @@ deno_core::extension!(deno_web,
op_encoding_new_decoder,
op_encoding_decode,
op_encoding_encode_into,
- op_encode_binary_string,
op_blob_create_part,
op_blob_slice_part,
op_blob_read_part,
@@ -87,7 +85,6 @@ deno_core::extension!(deno_web,
compression::op_compression_finish,
op_now<P>,
op_timer_handle,
- op_cancel_handle,
op_sleep,
op_transfer_arraybuffer,
stream_resource::op_readable_stream_resource_allocate,
@@ -439,19 +436,6 @@ fn op_transfer_arraybuffer<'a>(
Ok(v8::ArrayBuffer::with_backing_store(scope, &bs))
}
-#[op2]
-#[serde]
-fn op_encode_binary_string(#[buffer] s: &[u8]) -> ByteString {
- ByteString::from(s)
-}
-
-/// Creates a [`CancelHandle`] resource that can be used to cancel invocations of certain ops.
-#[op2(fast)]
-#[smi]
-pub fn op_cancel_handle(state: &mut OpState) -> u32 {
- state.resource_table.add(CancelHandle::new())
-}
-
pub fn get_declaration() -> PathBuf {
PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("lib.deno_web.d.ts")
}