foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-04 01:44:26 -05:00
Code Issues Packages 1 Wiki Activity

reorder copyN arguments to match Deno.copy (#4900)

Browse source
This commit is contained in:
Akshat Agarwal 2020-04-27 01:56:02 +05:30 • committed by GitHub
parent 26dfd3c110
commit 4f9bb11444
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
std/io/ioutil.ts
View file

@ -8,8 +8,8 @@ import { assert } from "../testing/asserts.ts";
* If read size is lesser than N, then returns nread * If read size is lesser than N, then returns nread
* */ * */
export async function copyN( export async function copyN(
dest: Writer,
r: Reader, r: Reader,
dest: Writer,
size: number size: number
): Promise<number> { ): Promise<number> {
let bytesRead = 0; let bytesRead = 0;

4
std/io/ioutil_test.ts
View file

@ -73,7 +73,7 @@ Deno.test(function testSliceLongToBytes2(): void {
Deno.test(async function testCopyN1(): Promise<void> { Deno.test(async function testCopyN1(): Promise<void> {
const w = new Buffer(); const w = new Buffer();
const r = stringsReader("abcdefghij"); const r = stringsReader("abcdefghij");
const n = await copyN(w, r, 3); const n = await copyN(r, w, 3);
assertEquals(n, 3); assertEquals(n, 3);
assertEquals(w.toString(), "abc"); assertEquals(w.toString(), "abc");
}); });
@ -81,7 +81,7 @@ Deno.test(async function testCopyN1(): Promise<void> {
Deno.test(async function testCopyN2(): Promise<void> { Deno.test(async function testCopyN2(): Promise<void> {
const w = new Buffer(); const w = new Buffer();
const r = stringsReader("abcdefghij"); const r = stringsReader("abcdefghij");
const n = await copyN(w, r, 11); const n = await copyN(r, w, 11);
assertEquals(n, 10); assertEquals(n, 10);
assertEquals(w.toString(), "abcdefghij"); assertEquals(w.toString(), "abcdefghij");
}); });

2
std/io/readers_test.ts
View file

@ -30,7 +30,7 @@ test(async function ioStringReader(): Promise<void> {
test(async function ioMultiReader(): Promise<void> { test(async function ioMultiReader(): Promise<void> {
const r = new MultiReader(new StringReader("abc"), new StringReader("def")); const r = new MultiReader(new StringReader("abc"), new StringReader("def"));
const w = new StringWriter(); const w = new StringWriter();
const n = await copyN(w, r, 4); const n = await copyN(r, w, 4);
assertEquals(n, 4); assertEquals(n, 4);
assertEquals(w.toString(), "abcd"); assertEquals(w.toString(), "abcd");
await copy(r, w); await copy(r, w);

2
std/io/writers_test.ts
View file

@ -7,7 +7,7 @@ import { copyN } from "./ioutil.ts";
test(async function ioStringWriter(): Promise<void> { test(async function ioStringWriter(): Promise<void> {
const w = new StringWriter("base"); const w = new StringWriter("base");
const r = new StringReader("0123456789"); const r = new StringReader("0123456789");
await copyN(w, r, 4); await copyN(r, w, 4);
assertEquals(w.toString(), "base0123"); assertEquals(w.toString(), "base0123");
await copy(r, w); await copy(r, w);
assertEquals(w.toString(), "base0123456789"); assertEquals(w.toString(), "base0123456789");

4
std/mime/multipart.ts
View file

@ -297,7 +297,7 @@ export class MultipartReader {
buf.reset(); buf.reset();
if (!p.fileName) { if (!p.fileName) {
// value // value
const n = await copyN(buf, p, maxValueBytes); const n = await copyN(p, buf, maxValueBytes);
maxValueBytes -= n; maxValueBytes -= n;
if (maxValueBytes < 0) { if (maxValueBytes < 0) {
throw new RangeError("message too large"); throw new RangeError("message too large");
@ -320,8 +320,8 @@ export class MultipartReader {
}); });
try { try {
const size = await copyN( const size = await copyN(
file,
new MultiReader(buf, p), new MultiReader(buf, p),
file,
maxValueBytes maxValueBytes
); );
file.close(); file.close();