diff options
| -rw-r--r-- | lib/_stream_readable.js | 4 | ||||
| -rw-r--r-- | lib/cluster.js | 5 | ||||
| -rw-r--r-- | lib/fs.js | 5 | ||||
| -rw-r--r-- | lib/internal/bootstrap_node.js | 6 | ||||
| -rw-r--r-- | lib/internal/child_process.js | 4 | ||||
| -rw-r--r-- | lib/url.js | 13 |
6 files changed, 17 insertions, 20 deletions
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index a308e8baed..463ac3bfbc 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -949,9 +949,7 @@ function fromListPartial(n, list, hasStrings) { ret = list.shift(); } else { // result spans more than one buffer - ret = (hasStrings ? - copyFromBufferString(n, list) : - copyFromBuffer(n, list)); + ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list); } return ret; } diff --git a/lib/cluster.js b/lib/cluster.js index 8d2f44f364..848b2247a8 100644 --- a/lib/cluster.js +++ b/lib/cluster.js @@ -21,6 +21,5 @@ 'use strict'; -module.exports = ('NODE_UNIQUE_ID' in process.env) ? - require('internal/cluster/child') : - require('internal/cluster/master'); +const childOrMaster = 'NODE_UNIQUE_ID' in process.env ? 'child' : 'master'; +module.exports = require(`internal/cluster/${childOrMaster}`); @@ -1357,9 +1357,8 @@ function FSWatcher() { if (status < 0) { self._handle.close(); const error = !filename ? - errnoException(status, 'Error watching file for changes:') : - errnoException(status, - `Error watching file ${filename} for changes:`); + errnoException(status, 'Error watching file for changes:') : + errnoException(status, `Error watching file ${filename} for changes:`); error.filename = filename; self.emit('error', error); } else { diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js index e7d2d94c86..efc66b1b23 100644 --- a/lib/internal/bootstrap_node.js +++ b/lib/internal/bootstrap_node.js @@ -275,9 +275,9 @@ enumerable: true, get: function() { if (!console) { - console = originalConsole === undefined ? - NativeModule.require('console') : - installInspectorConsole(originalConsole); + console = (originalConsole === undefined) ? + NativeModule.require('console') : + installInspectorConsole(originalConsole); } return console; } diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index 46343325a1..b0731ab7c2 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -883,8 +883,8 @@ function _validateStdio(stdio, sync) { } else if (getHandleWrapType(stdio) || getHandleWrapType(stdio.handle) || getHandleWrapType(stdio._handle)) { var handle = getHandleWrapType(stdio) ? - stdio : - getHandleWrapType(stdio.handle) ? stdio.handle : stdio._handle; + stdio : + getHandleWrapType(stdio.handle) ? stdio.handle : stdio._handle; acc.push({ type: 'wrap', diff --git a/lib/url.js b/lib/url.js index b3b05f4a89..70584f8d07 100644 --- a/lib/url.js +++ b/lib/url.js @@ -395,10 +395,9 @@ Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) { this.query = Object.create(null); } - var firstIdx = (questionIdx !== -1 && - (hashIdx === -1 || questionIdx < hashIdx) ? - questionIdx : - hashIdx); + const useQuestionIdx = + questionIdx !== -1 && (hashIdx === -1 || questionIdx < hashIdx); + const firstIdx = useQuestionIdx ? questionIdx : hashIdx; if (firstIdx === -1) { if (rest.length > 0) this.pathname = rest; @@ -585,9 +584,11 @@ Url.prototype.format = function format() { if (this.host) { host = auth + this.host; } else if (this.hostname) { - host = auth + (this.hostname.indexOf(':') === -1 ? + host = auth + ( + this.hostname.indexOf(':') === -1 ? this.hostname : - '[' + this.hostname + ']'); + '[' + this.hostname + ']' + ); if (this.port) { host += ':' + this.port; } |