summaryrefslogtreecommitdiff
path: root/lib/internal
diff options
context:
space:
mode:
authorRuben Bridgewater <ruben@bridgewater.de>2018-12-18 02:28:09 +0100
committerRuben Bridgewater <ruben@bridgewater.de>2018-12-20 13:14:46 +0100
commit4b7a530f2b1a789b3feb64e3698d61b4ccc6bab5 (patch)
tree1cd8dd1d0ff4c113081502ddca54d5f9c7be8cb4 /lib/internal
parent6f8ccef74ec514292ebf8ee65602d8c109b0aa2b (diff)
downloadandroid-node-v8-4b7a530f2b1a789b3feb64e3698d61b4ccc6bab5.tar.gz
android-node-v8-4b7a530f2b1a789b3feb64e3698d61b4ccc6bab5.tar.bz2
android-node-v8-4b7a530f2b1a789b3feb64e3698d61b4ccc6bab5.zip
lib: switch to object spread where possible
Use the object spread notation instead of using Object.assign. It is not only easier to read it is also faster as of V8 6.8. PR-URL: https://github.com/nodejs/node/pull/25104 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Yuta Hiroto <hello@hiroppy.me> Reviewed-By: Minwoo Jung <minwoo@nodesource.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'lib/internal')
-rw-r--r--lib/internal/child_process.js2
-rw-r--r--lib/internal/console/constructor.js9
-rw-r--r--lib/internal/http2/compat.js2
-rw-r--r--lib/internal/http2/core.js20
4 files changed, 17 insertions, 16 deletions
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index 195cc156fc..498dbf6a1c 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -636,7 +636,7 @@ function setupChannel(target, channel) {
throw new ERR_INVALID_ARG_TYPE('options', 'Object', options);
}
- options = Object.assign({ swallowErrors: false }, options);
+ options = { swallowErrors: false, ...options };
if (this.connected) {
return this._send(message, handle, options, callback);
diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
index 7e1bcf802f..e10eef74c2 100644
--- a/lib/internal/console/constructor.js
+++ b/lib/internal/console/constructor.js
@@ -294,10 +294,11 @@ Console.prototype.warn = function warn(...args) {
Console.prototype.error = Console.prototype.warn;
Console.prototype.dir = function dir(object, options) {
- options = Object.assign({
- customInspect: false
- }, this[kGetInspectOptions](this._stdout), options);
- this[kWriteToConsole](kUseStdout, util.inspect(object, options));
+ this[kWriteToConsole](kUseStdout, util.inspect(object, {
+ customInspect: false,
+ ...this[kGetInspectOptions](this._stdout),
+ ...options
+ }));
};
Console.prototype.time = function time(label = 'default') {
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
index 927504621d..23c4e2e0f0 100644
--- a/lib/internal/http2/compat.js
+++ b/lib/internal/http2/compat.js
@@ -512,7 +512,7 @@ class Http2ServerResponse extends Stream {
}
getHeaders() {
- return Object.assign({}, this[kHeaders]);
+ return { ...this[kHeaders] };
}
hasHeader(name) {
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 082bd552c2..f33ec48ff2 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -790,7 +790,7 @@ function pingCallback(cb) {
// 6. enablePush must be a boolean
// All settings are optional and may be left undefined
function validateSettings(settings) {
- settings = Object.assign({}, settings);
+ settings = { ...settings };
assertWithinRange('headerTableSize',
settings.headerTableSize,
0, kMaxInt);
@@ -1443,7 +1443,7 @@ class ClientHttp2Session extends Http2Session {
assertIsObject(options, 'options');
headers = Object.assign(Object.create(null), headers);
- options = Object.assign({}, options);
+ options = { ...options };
if (headers[HTTP2_HEADER_METHOD] === undefined)
headers[HTTP2_HEADER_METHOD] = HTTP2_METHOD_GET;
@@ -1848,7 +1848,7 @@ class Http2Stream extends Duplex {
throw new ERR_HTTP2_INVALID_STREAM();
assertIsObject(options, 'options');
- options = Object.assign({}, options);
+ options = { ...options };
validatePriorityOptions(options);
const priorityFn = submitPriority.bind(this, options);
@@ -2257,7 +2257,7 @@ class ServerHttp2Stream extends Http2Stream {
throw new ERR_INVALID_CALLBACK();
assertIsObject(options, 'options');
- options = Object.assign({}, options);
+ options = { ...options };
options.endStream = !!options.endStream;
assertIsObject(headers, 'headers');
@@ -2322,7 +2322,7 @@ class ServerHttp2Stream extends Http2Stream {
const state = this[kState];
assertIsObject(options, 'options');
- options = Object.assign({}, options);
+ options = { ...options };
const session = this[kSession];
debug(`Http2Stream ${this[kID]} [Http2Session ` +
@@ -2378,7 +2378,7 @@ class ServerHttp2Stream extends Http2Stream {
const session = this[kSession];
assertIsObject(options, 'options');
- options = Object.assign({}, options);
+ options = { ...options };
if (options.offset !== undefined && typeof options.offset !== 'number')
throw new ERR_INVALID_OPT_VALUE('offset', options.offset);
@@ -2441,7 +2441,7 @@ class ServerHttp2Stream extends Http2Stream {
throw new ERR_HTTP2_HEADERS_SENT();
assertIsObject(options, 'options');
- options = Object.assign({}, options);
+ options = { ...options };
if (options.offset !== undefined && typeof options.offset !== 'number')
throw new ERR_INVALID_OPT_VALUE('offset', options.offset);
@@ -2667,10 +2667,10 @@ function connectionListener(socket) {
function initializeOptions(options) {
assertIsObject(options, 'options');
- options = Object.assign({}, options);
+ options = { ...options };
options.allowHalfOpen = true;
assertIsObject(options.settings, 'options.settings');
- options.settings = Object.assign({}, options.settings);
+ options.settings = { ...options.settings };
// Used only with allowHTTP1
options.Http1IncomingMessage = options.Http1IncomingMessage ||
@@ -2775,7 +2775,7 @@ function connect(authority, options, listener) {
}
assertIsObject(options, 'options');
- options = Object.assign({}, options);
+ options = { ...options };
if (typeof authority === 'string')
authority = new URL(authority);