From c75f97f43b9ede14c0941a4e9a04943e92136a5b Mon Sep 17 00:00:00 2001 From: Jackson Tian Date: Mon, 15 Feb 2016 12:53:17 +0800 Subject: [PATCH] lib: reduce usage of `self = this` Remove unnecessary `self = this`. PR-URL: https://github.com/nodejs/node/pull/5231 Reviewed-By: James M Snell Conflicts: lib/domain.js --- doc/api/stream.markdown | 5 ++-- lib/dgram.js | 3 +-- lib/domain.js | 2 +- lib/https.js | 5 ++-- lib/net.js | 47 +++++++++++++++++--------------------- lib/repl.js | 6 ++--- test/parallel/test-zlib.js | 9 ++++---- 7 files changed, 34 insertions(+), 43 deletions(-) diff --git a/doc/api/stream.markdown b/doc/api/stream.markdown index 03dfd72d73381c..cdab6e82ab2cdc 100644 --- a/doc/api/stream.markdown +++ b/doc/api/stream.markdown @@ -1026,15 +1026,14 @@ function SimpleProtocol(source, options) { // source is a readable stream, such as a socket or file this._source = source; - var self = this; source.on('end', () => { - self.push(null); + this.push(null); }); // give it a kick whenever the source is readable // read(0) will not consume any bytes source.on('readable', () => { - self.read(0); + this.read(0); }); this._rawHeader = []; diff --git a/lib/dgram.js b/lib/dgram.js index 9e029d9c66122b..49151f704a1ef3 100644 --- a/lib/dgram.js +++ b/lib/dgram.js @@ -404,8 +404,7 @@ Socket.prototype.close = function(callback) { this._stopReceiving(); this._handle.close(); this._handle = null; - var self = this; - process.nextTick(socketCloseNT, self); + process.nextTick(socketCloseNT, this); return this; }; diff --git a/lib/domain.js b/lib/domain.js index 630d02ec332751..472c0f0c12b5a3 100644 --- a/lib/domain.js +++ b/lib/domain.js @@ -101,7 +101,7 @@ Domain.prototype._errorHandler = function errorHandler(er) { // as this would throw an error, make the process exit, and thus // prevent the process 'uncaughtException' event from being emitted // if a listener is set. - if (EventEmitter.listenerCount(self, 'error') > 0) { + if (EventEmitter.listenerCount(this, 'error') > 0) { try { // Set the _emittingTopLevelDomainError so that we know that, even // if technically the top-level domain is still active, it would diff --git a/lib/https.js b/lib/https.js index 75beb01ebf8fd2..e80b41e21a7e35 100644 --- a/lib/https.js +++ b/lib/https.js @@ -76,12 +76,11 @@ function createConnection(port, host, options) { } } - const self = this; - const socket = tls.connect(options, function() { + const socket = tls.connect(options, () => { if (!options._agentKey) return; - self._cacheSession(options._agentKey, socket.getSession()); + this._cacheSession(options._agentKey, socket.getSession()); }); // Evict session on error diff --git a/lib/net.js b/lib/net.js index 0d6a79f2714528..563827eb307db5 100644 --- a/lib/net.js +++ b/lib/net.js @@ -299,9 +299,8 @@ Socket.prototype.read = function(n) { Socket.prototype.listen = function() { debug('socket.listen'); - var self = this; - self.on('connection', arguments[0]); - listen(self, null, null, null); + this.on('connection', arguments[0]); + listen(this, null, null, null); }; @@ -883,7 +882,6 @@ Socket.prototype.connect = function(options, cb) { this._sockname = null; } - var self = this; var pipe = !!options.path; debug('pipe', pipe, options.path); @@ -893,21 +891,20 @@ Socket.prototype.connect = function(options, cb) { } if (typeof cb === 'function') { - self.once('connect', cb); + this.once('connect', cb); } this._unrefTimer(); - self._connecting = true; - self.writable = true; + this._connecting = true; + this.writable = true; if (pipe) { - connect(self, options.path); - + connect(this, options.path); } else { - lookupAndConnect(self, options); + lookupAndConnect(this, options); } - return self; + return this; }; @@ -1194,11 +1191,10 @@ exports._createServerHandle = createServerHandle; Server.prototype._listen2 = function(address, port, addressType, backlog, fd) { debug('listen2', address, port, addressType, backlog, fd); - var self = this; // If there is not yet a handle, we need to create one and bind. // In the case of a server sent via IPC, we don't need to do this. - if (self._handle) { + if (this._handle) { debug('_listen2: have a handle already'); } else { debug('_listen2: create a handle'); @@ -1223,22 +1219,22 @@ Server.prototype._listen2 = function(address, port, addressType, backlog, fd) { if (typeof rval === 'number') { var error = exceptionWithHostPort(rval, 'listen', address, port); - process.nextTick(emitErrorNT, self, error); + process.nextTick(emitErrorNT, this, error); return; } - self._handle = rval; + this._handle = rval; } - self._handle.onconnection = onconnection; - self._handle.owner = self; + this._handle.onconnection = onconnection; + this._handle.owner = this; - var err = _listen(self._handle, backlog); + var err = _listen(this._handle, backlog); if (err) { var ex = exceptionWithHostPort(err, 'listen', address, port); - self._handle.close(); - self._handle = null; - process.nextTick(emitErrorNT, self, ex); + this._handle.close(); + this._handle = null; + process.nextTick(emitErrorNT, this, ex); return; } @@ -1249,7 +1245,7 @@ Server.prototype._listen2 = function(address, port, addressType, backlog, fd) { if (this._unref) this.unref(); - process.nextTick(emitListeningNT, self); + process.nextTick(emitListeningNT, this); }; @@ -1517,15 +1513,14 @@ Server.prototype.close = function(cb) { Server.prototype._emitCloseIfDrained = function() { debug('SERVER _emitCloseIfDrained'); - var self = this; - if (self._handle || self._connections) { + if (this._handle || this._connections) { debug('SERVER handle? %j connections? %d', - !!self._handle, self._connections); + !!this._handle, this._connections); return; } - process.nextTick(emitCloseNT, self); + process.nextTick(emitCloseNT, this); }; diff --git a/lib/repl.js b/lib/repl.js index b6ded489cb3049..35cde4c1df0ec0 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -1124,7 +1124,7 @@ function regexpEscape(s) { REPLServer.prototype.convertToContext = function(cmd) { const scopeVar = /^\s*var\s*([_\w\$]+)(.*)$/m; const scopeFunc = /^\s*function\s*([_\w\$]+)/; - var self = this, matches; + var matches; // Replaces: var foo = "bar"; with: self.context.foo = bar; matches = scopeVar.exec(cmd); @@ -1133,9 +1133,9 @@ REPLServer.prototype.convertToContext = function(cmd) { } // Replaces: function foo() {}; with: foo = function foo() {}; - matches = scopeFunc.exec(self.bufferedCommand); + matches = scopeFunc.exec(this.bufferedCommand); if (matches && matches.length === 2) { - return matches[1] + ' = ' + self.bufferedCommand; + return matches[1] + ' = ' + this.bufferedCommand; } return cmd; diff --git a/test/parallel/test-zlib.js b/test/parallel/test-zlib.js index 1256d94a61402d..305d28865d992b 100644 --- a/test/parallel/test-zlib.js +++ b/test/parallel/test-zlib.js @@ -125,11 +125,10 @@ SlowStream.prototype.resume = function() { SlowStream.prototype.end = function(chunk) { // walk over the chunk in blocks. - var self = this; - self.chunk = chunk; - self.length = chunk.length; - self.resume(); - return self.ended; + this.chunk = chunk; + this.length = chunk.length; + this.resume(); + return this.ended; };