diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/bench/deno_tcp_proxy.ts | 4 | ||||
-rw-r--r-- | cli/dts/lib.deno.ns.d.ts | 6 | ||||
-rw-r--r-- | cli/tests/cat.ts | 3 | ||||
-rw-r--r-- | cli/tests/echo_server.ts | 3 | ||||
-rw-r--r-- | cli/tests/unit/files_test.ts | 3 |
5 files changed, 14 insertions, 5 deletions
diff --git a/cli/bench/deno_tcp_proxy.ts b/cli/bench/deno_tcp_proxy.ts index bab8eac19..df74de8c4 100644 --- a/cli/bench/deno_tcp_proxy.ts +++ b/cli/bench/deno_tcp_proxy.ts @@ -1,5 +1,7 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. // Used for benchmarking Deno's tcp proxy performance. +import { copy } from "../../test_util/std/io/util.ts"; + const addr = Deno.args[0] || "127.0.0.1:4500"; const originAddr = Deno.args[1] || "127.0.0.1:4501"; @@ -14,7 +16,7 @@ async function handle(conn: Deno.Conn): Promise<void> { port: Number(originPort), }); try { - await Promise.all([Deno.copy(conn, origin), Deno.copy(origin, conn)]); + await Promise.all([copy(conn, origin), copy(origin, conn)]); } catch (e) { if ( !(e instanceof Deno.errors.BrokenPipe) && diff --git a/cli/dts/lib.deno.ns.d.ts b/cli/dts/lib.deno.ns.d.ts index e1c558f37..b5b61cd16 100644 --- a/cli/dts/lib.deno.ns.d.ts +++ b/cli/dts/lib.deno.ns.d.ts @@ -421,7 +421,11 @@ declare namespace Deno { seekSync(offset: number, whence: SeekMode): number; } - /** Copies from `src` to `dst` until either EOF (`null`) is read from `src` or + /** + * @deprecated Use `copy` from https://deno.land/std/io/util.ts instead. + * `Deno.copy` will be removed in Deno 2.0. + * + * Copies from `src` to `dst` until either EOF (`null`) is read from `src` or * an error occurs. It resolves to the number of bytes copied or rejects with * the first error encountered while copying. * diff --git a/cli/tests/cat.ts b/cli/tests/cat.ts index a5b38fccd..0cfd99d22 100644 --- a/cli/tests/cat.ts +++ b/cli/tests/cat.ts @@ -1,8 +1,9 @@ +import { copy } from "../../test_util/std/io/util.ts"; async function main(): Promise<void> { for (let i = 1; i < Deno.args.length; i++) { const filename = Deno.args[i]; const file = await Deno.open(filename); - await Deno.copy(file, Deno.stdout); + await copy(file, Deno.stdout); } } diff --git a/cli/tests/echo_server.ts b/cli/tests/echo_server.ts index fcb157fdb..7c8b0e42d 100644 --- a/cli/tests/echo_server.ts +++ b/cli/tests/echo_server.ts @@ -1,10 +1,11 @@ +import { copy } from "../../test_util/std/io/util.ts"; const addr = Deno.args[0] || "0.0.0.0:4544"; const [hostname, port] = addr.split(":"); const listener = Deno.listen({ hostname, port: Number(port) }); console.log("listening on", addr); listener.accept().then( async (conn): Promise<void> => { - console.log("received bytes:", await Deno.copy(conn, conn)); + console.log("received bytes:", await copy(conn, conn)); conn.close(); listener.close(); }, diff --git a/cli/tests/unit/files_test.ts b/cli/tests/unit/files_test.ts index 51ca1c579..348d012b4 100644 --- a/cli/tests/unit/files_test.ts +++ b/cli/tests/unit/files_test.ts @@ -8,6 +8,7 @@ import { assertThrowsAsync, unitTest, } from "./test_util.ts"; +import { copy } from "../../../test_util/std/io/util.ts"; unitTest(function filesStdioFileDescriptors(): void { assertEquals(Deno.stdin.rid, 0); @@ -21,7 +22,7 @@ unitTest({ perms: { read: true } }, async function filesCopyToStdout(): Promise< const filename = "cli/tests/fixture.json"; const file = await Deno.open(filename); assert(file.rid > 2); - const bytesWritten = await Deno.copy(file, Deno.stdout); + const bytesWritten = await copy(file, Deno.stdout); const fileSize = Deno.statSync(filename).size; assertEquals(bytesWritten, fileSize); file.close(); |