diff options
author | Jackson Tian <puling.tyq@alibaba-inc.com> | 2016-02-15 12:53:17 +0800 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2016-03-21 15:48:51 -0700 |
commit | d2b93e55cc941c33f06af11304eee119d56abbbe (patch) | |
tree | 0182073ae17662f6eac4dc0e7cc1705227864831 /lib | |
parent | f70c71f168ecf298733617c4c7ff445740d708ee (diff) | |
download | node-new-d2b93e55cc941c33f06af11304eee119d56abbbe.tar.gz |
lib: reduce usage of `self = this`
Remove unnecessary `self = this`.
PR-URL: https://github.com/nodejs/node/pull/5231
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/dgram.js | 3 | ||||
-rw-r--r-- | lib/domain.js | 7 | ||||
-rw-r--r-- | lib/https.js | 5 | ||||
-rw-r--r-- | lib/net.js | 47 | ||||
-rw-r--r-- | lib/repl.js | 6 |
5 files changed, 30 insertions, 38 deletions
diff --git a/lib/dgram.js b/lib/dgram.js index 0c92e361c0..5ac06b40f7 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 41b4859361..d6958b2c30 100644 --- a/lib/domain.js +++ b/lib/domain.js @@ -60,7 +60,6 @@ Domain.prototype._disposed = undefined; // Called by process._fatalException in case an error was thrown. Domain.prototype._errorHandler = function errorHandler(er) { var caught = false; - var self = this; // ignore errors on disposed domains. // @@ -89,13 +88,13 @@ 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 // be ok to abort on an uncaught exception at this point process._emittingTopLevelDomainError = true; - caught = self.emit('error', er); + caught = this.emit('error', er); } finally { process._emittingTopLevelDomainError = false; } @@ -111,7 +110,7 @@ Domain.prototype._errorHandler = function errorHandler(er) { // // If caught is false after this, then there's no need to exit() // the domain, because we're going to crash the process anyway. - caught = self.emit('error', er); + caught = this.emit('error', er); } catch (er2) { // The domain error handler threw! oh no! // See if another domain can catch THIS error, diff --git a/lib/https.js b/lib/https.js index 2cf1f8c491..c1d1a51dab 100644 --- a/lib/https.js +++ b/lib/https.js @@ -77,12 +77,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 e41ef19954..c5a5b357ac 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; }; @@ -1198,11 +1195,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'); @@ -1227,22 +1223,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; } @@ -1253,7 +1249,7 @@ Server.prototype._listen2 = function(address, port, addressType, backlog, fd) { if (this._unref) this.unref(); - process.nextTick(emitListeningNT, self); + process.nextTick(emitListeningNT, this); }; @@ -1522,15 +1518,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 b9f6f334d9..7d05f659f5 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -1155,7 +1155,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); @@ -1164,9 +1164,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; |