From 678313b17677e012ba9a07aeca58af1aafbf4e8c Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Tue, 28 Apr 2020 17:40:43 +0100 Subject: BREAKING: Remove Deno.EOF, use null instead (#4953) --- cli/js/buffer.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cli/js/buffer.ts') diff --git a/cli/js/buffer.ts b/cli/js/buffer.ts index e2a7e3de9..fdacf70a9 100644 --- a/cli/js/buffer.ts +++ b/cli/js/buffer.ts @@ -4,7 +4,7 @@ // Copyright 2009 The Go Authors. All rights reserved. BSD license. // https://github.com/golang/go/blob/master/LICENSE -import { Reader, Writer, EOF, ReaderSync, WriterSync } from "./io.ts"; +import { Reader, Writer, ReaderSync, WriterSync } from "./io.ts"; import { assert } from "./util.ts"; import { TextDecoder } from "./web/text_encoding.ts"; @@ -91,7 +91,7 @@ export class Buffer implements Reader, ReaderSync, Writer, WriterSync { this.#buf = new Uint8Array(this.#buf.buffer, 0, len); }; - readSync(p: Uint8Array): number | EOF { + readSync(p: Uint8Array): number | null { if (this.empty()) { // Buffer is empty, reset to recover space. this.reset(); @@ -99,14 +99,14 @@ export class Buffer implements Reader, ReaderSync, Writer, WriterSync { // this edge case is tested in 'bufferReadEmptyAtEOF' test return 0; } - return EOF; + return null; } const nread = copyBytes(p, this.#buf.subarray(this.#off)); this.#off += nread; return nread; } - read(p: Uint8Array): Promise { + read(p: Uint8Array): Promise { const rr = this.readSync(p); return Promise.resolve(rr); } @@ -169,7 +169,7 @@ export class Buffer implements Reader, ReaderSync, Writer, WriterSync { this.#reslice(i); const fub = new Uint8Array(this.#buf.buffer, i); const nread = await r.read(fub); - if (nread === EOF) { + if (nread === null) { return n; } this.#reslice(i + nread); @@ -188,7 +188,7 @@ export class Buffer implements Reader, ReaderSync, Writer, WriterSync { this.#reslice(i); const fub = new Uint8Array(this.#buf.buffer, i); const nread = r.readSync(fub); - if (nread === EOF) { + if (nread === null) { return n; } this.#reslice(i + nread); -- cgit v1.2.3