stream: simplify uint8ArrayToBuffer helper

The fallback code is no longer used when exporting to readable-stream. Refs: #29514 PR-URL: #30041 Fixes: #30040 Reviewed-By: Yongsheng Zhang <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
nodejs · Oct 23, 2019 · 81ab32f · 81ab32f
1 parent 96def2b
commit 81ab32f
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/lib/stream.js b/lib/stream.js
@@ -21,9 +21,9 @@
 
 'use strict';
 
-const { Buffer } = require('buffer');
 const pipeline = require('internal/streams/pipeline');
 const eos = require('internal/streams/end-of-stream');
+const internalBuffer = require('internal/buffer');
 
 // Note: export Stream before Readable/Writable/Duplex/...
 // to avoid a cross-reference(require) issues
@@ -42,19 +42,8 @@ Stream.finished = eos;
 Stream.Stream = Stream;
 
 Stream._isUint8Array = require('internal/util/types').isUint8Array;
-
-try {
-  const internalBuffer = require('internal/buffer');
-  Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
-    return new internalBuffer.FastBuffer(chunk.buffer,
-                                         chunk.byteOffset,
-                                         chunk.byteLength);
-  };
-} catch (e) { // eslint-disable-line no-unused-vars
-}
-
-if (!Stream._uint8ArrayToBuffer) {
-  Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
-    return Buffer.prototype.slice.call(chunk);
-  };
-}
+Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
+  return new internalBuffer.FastBuffer(chunk.buffer,
+                                       chunk.byteOffset,
+                                       chunk.byteLength);
+};