1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "net: remove usage of require('util')"

Browse Source 
This reverts commit e112fb4c221f9749fd9271c95a5f544476511292.
This commit broke parallel/test-net-access-byteswritten.

PR-URL: https://github.com/nodejs/node/pull/26896
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
This commit is contained in:
Rich Trott 2019-03-24 18:53:41 -07:00
parent 85fda7e848
commit 3f41fcbe83
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/net.js
View File

@ -23,8 +23,7 @@
const EventEmitter = require('events'); const EventEmitter = require('events');
const stream = require('stream'); const stream = require('stream');
const { inspect } = require('internal/util/inspect'); const util = require('util');
const { debuglog } = require('internal/util/debuglog');
const internalUtil = require('internal/util'); const internalUtil = require('internal/util');
const { const {
isIP, isIP,
@ -131,7 +130,7 @@ function getNewAsyncId(handle) {
} }
const debug = debuglog('net'); const debug = util.debuglog('net');
function isPipeName(s) { function isPipeName(s) {
return typeof s === 'string' && toNumber(s) === false; return typeof s === 'string' && toNumber(s) === false;
@ -336,8 +335,7 @@ function Socket(options) {
this[kBytesRead] = 0; this[kBytesRead] = 0;
this[kBytesWritten] = 0; this[kBytesWritten] = 0;
} }
Object.setPrototypeOf(Socket.prototype, stream.Duplex.prototype); util.inherits(Socket, stream.Duplex);
Object.setPrototypeOf(Socket, stream.Duplex);
// Refresh existing timeouts. // Refresh existing timeouts.
Socket.prototype._unrefTimer = function _unrefTimer() { Socket.prototype._unrefTimer = function _unrefTimer() {
@ -1414,7 +1412,7 @@ Server.prototype.listen = function(...args) {
'must have the property "port" or "path"'); 'must have the property "port" or "path"');
} }
throw new ERR_INVALID_OPT_VALUE('options', inspect(options)); throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options));
}; };
function lookupAndListen(self, port, address, backlog, exclusive, flags) { function lookupAndListen(self, port, address, backlog, exclusive, flags) {