From c9ef4f3d4439bc683d61db0c82f875e1dfeccbff Mon Sep 17 00:00:00 2001 From: Asher Gomez Date: Wed, 4 Sep 2024 10:01:28 +1000 Subject: [PATCH] BREAKING(io): remove `Deno.read[Sync]()` --- cli/bench/deno_common.js | 3 +- cli/tsc/dts/lib.deno.ns.d.ts | 64 ------------------------- runtime/js/90_deno_ns.js | 16 ------- runtime/js/99_main.js | 4 -- tests/specs/future/runtime_api/main.js | 2 - tests/specs/future/runtime_api/main.out | 2 - 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/cli/bench/deno_common.js b/cli/bench/deno_common.js index ba88c79ca46dca..3693333915ab04 100644 --- a/cli/bench/deno_common.js +++ b/cli/bench/deno_common.js @@ -46,8 +46,7 @@ Deno.bench("b64_rt_short", { n: 1e6 }, () => { const buf = new Uint8Array(100); const file = Deno.openSync("/dev/zero"); Deno.bench("read_zero", { n: 5e5 }, () => { - // deno-lint-ignore no-deprecated-deno-api - Deno.readSync(file.rid, buf); + file.readSync(buf); }); } diff --git a/cli/tsc/dts/lib.deno.ns.d.ts b/cli/tsc/dts/lib.deno.ns.d.ts index 8489a8de87455a..da45627d0c67cc 100644 --- a/cli/tsc/dts/lib.deno.ns.d.ts +++ b/cli/tsc/dts/lib.deno.ns.d.ts @@ -1920,70 +1920,6 @@ declare namespace Deno { */ export function createSync(path: string | URL): FsFile; - /** Read from a resource ID (`rid`) into an array buffer (`buffer`). - * - * Resolves to either the number of bytes read during the operation or EOF - * (`null`) if there was nothing more to read. - * - * It is possible for a read to successfully return with `0` bytes. This does - * not indicate EOF. - * - * This function is one of the lowest level APIs and most users should not - * work with this directly, but rather use {@linkcode ReadableStream} and - * {@linkcode https://jsr.io/@std/streams/doc/to-array-buffer/~/toArrayBuffer | toArrayBuffer} - * instead. - * - * **It is not guaranteed that the full buffer will be read in a single call.** - * - * ```ts - * // if "/foo/bar.txt" contains the text "hello world": - * using file = await Deno.open("/foo/bar.txt"); - * const buf = new Uint8Array(100); - * const numberOfBytesRead = await Deno.read(file.rid, buf); // 11 bytes - * const text = new TextDecoder().decode(buf); // "hello world" - * ``` - * - * @deprecated This will be removed in Deno 2.0. See the - * {@link https://docs.deno.com/runtime/manual/advanced/migrate_deprecations | Deno 1.x to 2.x Migration Guide} - * for migration instructions. - * - * @category I/O - */ - export function read(rid: number, buffer: Uint8Array): Promise; - - /** Synchronously read from a resource ID (`rid`) into an array buffer - * (`buffer`). - * - * Returns either the number of bytes read during the operation or EOF - * (`null`) if there was nothing more to read. - * - * It is possible for a read to successfully return with `0` bytes. This does - * not indicate EOF. - * - * This function is one of the lowest level APIs and most users should not - * work with this directly, but rather use {@linkcode ReadableStream} and - * {@linkcode https://jsr.io/@std/streams/doc/to-array-buffer/~/toArrayBuffer | toArrayBuffer} - * instead. - * - * **It is not guaranteed that the full buffer will be read in a single - * call.** - * - * ```ts - * // if "/foo/bar.txt" contains the text "hello world": - * using file = Deno.openSync("/foo/bar.txt"); - * const buf = new Uint8Array(100); - * const numberOfBytesRead = Deno.readSync(file.rid, buf); // 11 bytes - * const text = new TextDecoder().decode(buf); // "hello world" - * ``` - * - * @deprecated This will be removed in Deno 2.0. See the - * {@link https://docs.deno.com/runtime/manual/advanced/migrate_deprecations | Deno 1.x to 2.x Migration Guide} - * for migration instructions. - * - * @category I/O - */ - export function readSync(rid: number, buffer: Uint8Array): number | null; - /** Write to the resource ID (`rid`) the contents of the array buffer (`data`). * * Resolves to the number of bytes written. This function is one of the lowest diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js index 7c805e64768f19..bda5dd24dc32f5 100644 --- a/runtime/js/90_deno_ns.js +++ b/runtime/js/90_deno_ns.js @@ -105,22 +105,6 @@ const denoNs = { writeAllSync: buffer.writeAllSync, copy: io.copy, SeekMode: io.SeekMode, - read(rid, buffer) { - internals.warnOnDeprecatedApi( - "Deno.read()", - new Error().stack, - "Use `reader.read()` instead.", - ); - return io.read(rid, buffer); - }, - readSync(rid, buffer) { - internals.warnOnDeprecatedApi( - "Deno.readSync()", - new Error().stack, - "Use `reader.readSync()` instead.", - ); - return io.readSync(rid, buffer); - }, write(rid, data) { internals.warnOnDeprecatedApi( "Deno.write()", diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index 174612851341a0..8cd4d0a9537c3c 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -811,8 +811,6 @@ function bootstrapMainRuntime(runtimeOptions, warmup = false) { delete Deno.funlockSync; delete Deno.readAll; delete Deno.readAllSync; - delete Deno.read; - delete Deno.readSync; delete Deno.seek; delete Deno.seekSync; delete Deno.writeAll; @@ -988,8 +986,6 @@ function bootstrapWorkerRuntime( delete Deno.funlockSync; delete Deno.readAll; delete Deno.readAllSync; - delete Deno.read; - delete Deno.readSync; delete Deno.seek; delete Deno.seekSync; delete Deno.writeAll; diff --git a/tests/specs/future/runtime_api/main.js b/tests/specs/future/runtime_api/main.js index ab53a809bc40c1..f7b41b599bb0a3 100644 --- a/tests/specs/future/runtime_api/main.js +++ b/tests/specs/future/runtime_api/main.js @@ -13,8 +13,6 @@ console.log("Deno.funlock is", Deno.funlock); console.log("Deno.funlockSync is", Deno.funlockSync); console.log("Deno.readAll is", Deno.readAll); console.log("Deno.readAllSync is", Deno.readAllSync); -console.log("Deno.read is", Deno.read); -console.log("Deno.readSync is", Deno.readSync); console.log("Deno.seek is", Deno.seek); console.log("Deno.seekSync is", Deno.seekSync); console.log("Deno.writeAll is", Deno.writeAll); diff --git a/tests/specs/future/runtime_api/main.out b/tests/specs/future/runtime_api/main.out index 08b62ea3a97acd..95bc7c8636b750 100644 --- a/tests/specs/future/runtime_api/main.out +++ b/tests/specs/future/runtime_api/main.out @@ -10,8 +10,6 @@ Deno.funlock is undefined Deno.funlockSync is undefined Deno.readAll is undefined Deno.readAllSync is undefined -Deno.read is undefined -Deno.readSync is undefined Deno.seek is undefined Deno.seekSync is undefined Deno.writeAll is undefined