From e166ea9d557ebc34c0c9c0807392ada1c4792b17 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Fri, 7 Mar 2025 22:03:01 -0800 Subject: [PATCH] fix --- src/js/internal/streams/readable.ts | 12 ++++++------ src/js/internal/streams/writable.ts | 4 ++-- src/js/node/http.ts | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/js/internal/streams/readable.ts b/src/js/internal/streams/readable.ts index 5dbe83471d..393ef121eb 100644 --- a/src/js/internal/streams/readable.ts +++ b/src/js/internal/streams/readable.ts @@ -24,7 +24,7 @@ const { const { aggregateTwoErrors } = require("internal/errors"); const { validateObject } = require("internal/validators"); const { StringDecoder } = require("node:string_decoder"); -const from = require("internal/streams/from"); +const from_ = require("internal/streams/from"); const { SafeSet } = require("internal/primordials"); const { kAutoDestroyed } = require("internal/shared"); @@ -1136,21 +1136,21 @@ Readable.prototype.resume = function resume() { } else { state[kState] &= ~kFlowing; } - emitResumeNT(this, state); + resume2(this, state); } state[kState] |= kHasPaused; state[kState] &= ~kPaused; return this; }; -function emitResumeNT(stream, state) { +function resume2(stream, state) { if ((state[kState] & kResumeScheduled) === 0) { state[kState] |= kResumeScheduled; - process.nextTick(emitResume, stream, state); + process.nextTick(resume3, stream, state); } } -function emitResume(stream, state) { +function resume3(stream, state) { $debug("resume", (state[kState] & kReading) !== 0); if ((state[kState] & kReading) === 0) { stream.read(0); @@ -1618,7 +1618,7 @@ function endWritableNT(stream) { } Readable.from = function from(iterable, opts) { - return from(Readable, iterable, opts); + return from_(Readable, iterable, opts); }; // Lazy to avoid circular references diff --git a/src/js/internal/streams/writable.ts b/src/js/internal/streams/writable.ts index 85991c0f7e..b4c39da7ea 100644 --- a/src/js/internal/streams/writable.ts +++ b/src/js/internal/streams/writable.ts @@ -1072,7 +1072,7 @@ ObjectDefineProperties(Writable.prototype, { }, }); -const destroy = destroyImpl.destroy; +const destroy_ = destroyImpl.destroy; Writable.prototype.destroy = function destroy(err, cb) { const state = this._writableState; @@ -1081,7 +1081,7 @@ Writable.prototype.destroy = function destroy(err, cb) { process.nextTick(errorBuffer, state); } - destroy.$call(this, err, cb); + destroy_.$call(this, err, cb); return this; }; diff --git a/src/js/node/http.ts b/src/js/node/http.ts index b84aa3f0ac..c0e0d7f8f9 100644 --- a/src/js/node/http.ts +++ b/src/js/node/http.ts @@ -8,8 +8,8 @@ const { urlToHttpOptions } = require("internal/url"); const { validateFunction, checkIsHttpToken } = require("internal/validators"); const { - getHeader, - setHeader, + getHeader: getHeader_, + setHeader: setHeader_, assignHeaders: assignHeadersFast, assignEventCallback, setRequestTimeout, @@ -1034,7 +1034,7 @@ OutgoingMessage.prototype.appendHeader = function appendHeader(name, value) { OutgoingMessage.prototype.flushHeaders = function flushHeaders() {}; OutgoingMessage.prototype.getHeader = function getHeader(name) { - return getHeader(this[headersSymbol], name); + return getHeader_(this[headersSymbol], name); }; OutgoingMessage.prototype.getHeaders = function getHeaders() { @@ -1429,7 +1429,7 @@ ServerResponse.prototype.setHeader = function setHeader(name, value) { if (typeof value === "number") { value = String(value); } - setHeader(headers, name, value); + setHeader_(headers, name, value); return this; };