diff options
author | Rich Trott <rtrott@gmail.com> | 2019-02-05 21:45:46 -0800 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2019-02-08 00:01:12 -0800 |
commit | 62942e9ad7a59b76e9255ea2560bad2245709efc (patch) | |
tree | b293b632cdd808efc578db6f122145032778d22a /lib/internal | |
parent | 5d609bb11c4c4b73f86100363430010b663f0775 (diff) | |
download | android-node-v8-62942e9ad7a59b76e9255ea2560bad2245709efc.tar.gz android-node-v8-62942e9ad7a59b76e9255ea2560bad2245709efc.tar.bz2 android-node-v8-62942e9ad7a59b76e9255ea2560bad2245709efc.zip |
lib: replace 'assert' with 'internal/assert' for many built-ins
Replace large 'assert' module with tiny 'internal/assert' module for
many built-in uses.
PR-URL: https://github.com/nodejs/node/pull/25956
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
Diffstat (limited to 'lib/internal')
-rw-r--r-- | lib/internal/child_process.js | 2 | ||||
-rw-r--r-- | lib/internal/cluster/child.js | 2 | ||||
-rw-r--r-- | lib/internal/cluster/master.js | 2 | ||||
-rw-r--r-- | lib/internal/cluster/shared_handle.js | 2 | ||||
-rw-r--r-- | lib/internal/crypto/cipher.js | 2 | ||||
-rw-r--r-- | lib/internal/errors.js | 2 | ||||
-rw-r--r-- | lib/internal/fs/watchers.js | 2 | ||||
-rw-r--r-- | lib/internal/http2/compat.js | 2 | ||||
-rw-r--r-- | lib/internal/modules/cjs/loader.js | 2 | ||||
-rw-r--r-- | lib/internal/modules/esm/module_job.js | 2 | ||||
-rw-r--r-- | lib/internal/process/main_thread_only.js | 2 | ||||
-rw-r--r-- | lib/internal/test/heap.js | 9 |
12 files changed, 16 insertions, 15 deletions
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index cb0d8ec6b6..edbf396cf5 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -19,7 +19,7 @@ const EventEmitter = require('events'); const net = require('net'); const dgram = require('dgram'); const util = require('util'); -const assert = require('assert'); +const assert = require('internal/assert'); const { Process } = internalBinding('process_wrap'); const { diff --git a/lib/internal/cluster/child.js b/lib/internal/cluster/child.js index 272b0d2bd9..38d52948e5 100644 --- a/lib/internal/cluster/child.js +++ b/lib/internal/cluster/child.js @@ -1,5 +1,5 @@ 'use strict'; -const assert = require('assert'); +const assert = require('internal/assert'); const path = require('path'); const EventEmitter = require('events'); const { owner_symbol } = require('internal/async_hooks').symbols; diff --git a/lib/internal/cluster/master.js b/lib/internal/cluster/master.js index c4f8e2b0ef..a0e194c63e 100644 --- a/lib/internal/cluster/master.js +++ b/lib/internal/cluster/master.js @@ -1,5 +1,5 @@ 'use strict'; -const assert = require('assert'); +const assert = require('internal/assert'); const { fork } = require('child_process'); const path = require('path'); const EventEmitter = require('events'); diff --git a/lib/internal/cluster/shared_handle.js b/lib/internal/cluster/shared_handle.js index 0b5f153193..408657623b 100644 --- a/lib/internal/cluster/shared_handle.js +++ b/lib/internal/cluster/shared_handle.js @@ -1,5 +1,5 @@ 'use strict'; -const assert = require('assert'); +const assert = require('internal/assert'); const dgram = require('internal/dgram'); const net = require('net'); diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js index 0e8e5c4cf8..a2ede771ac 100644 --- a/lib/internal/crypto/cipher.js +++ b/lib/internal/crypto/cipher.js @@ -34,7 +34,7 @@ const { publicEncrypt: _publicEncrypt } = internalBinding('crypto'); -const assert = require('assert'); +const assert = require('internal/assert'); const LazyTransform = require('internal/streams/lazy_transform'); const { deprecate, normalizeEncoding } = require('internal/util'); diff --git a/lib/internal/errors.js b/lib/internal/errors.js index d8071e0063..13a6194d0c 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -208,7 +208,7 @@ function getMessage(key, args) { const msg = messages.get(key); if (util === undefined) util = require('util'); - if (assert === undefined) assert = require('assert'); + if (assert === undefined) assert = require('internal/assert'); if (typeof msg === 'function') { assert( diff --git a/lib/internal/fs/watchers.js b/lib/internal/fs/watchers.js index 83c9b429ef..32d660a594 100644 --- a/lib/internal/fs/watchers.js +++ b/lib/internal/fs/watchers.js @@ -19,7 +19,7 @@ const { const { toNamespacedPath } = require('path'); const { validateUint32 } = require('internal/validators'); const { toPathIfFileURL } = require('internal/url'); -const assert = require('assert'); +const assert = require('internal/assert'); const kOldStatus = Symbol('kOldStatus'); const kUseBigint = Symbol('kUseBigint'); diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js index 23c4e2e0f0..ae5958912e 100644 --- a/lib/internal/http2/compat.js +++ b/lib/internal/http2/compat.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('internal/assert'); const Stream = require('stream'); const Readable = Stream.Readable; const binding = internalBinding('http2'); diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 3405ef4322..158dda2fdc 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -25,7 +25,7 @@ const { NativeModule } = require('internal/bootstrap/loaders'); const { pathToFileURL } = require('internal/url'); const util = require('util'); const vm = require('vm'); -const assert = require('assert').ok; +const assert = require('internal/assert'); const fs = require('fs'); const internalFS = require('internal/fs/utils'); const path = require('path'); diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js index e900babefd..016495096c 100644 --- a/lib/internal/modules/esm/module_job.js +++ b/lib/internal/modules/esm/module_job.js @@ -7,7 +7,7 @@ const { } = primordials; const { decorateErrorStack } = require('internal/util'); -const assert = require('assert'); +const assert = require('internal/assert'); const resolvedPromise = SafePromise.resolve(); function noop() {} diff --git a/lib/internal/process/main_thread_only.js b/lib/internal/process/main_thread_only.js index 290d2f7e9e..0ce063f928 100644 --- a/lib/internal/process/main_thread_only.js +++ b/lib/internal/process/main_thread_only.js @@ -153,7 +153,7 @@ function createSignalHandlers() { } function setupChildProcessIpcChannel() { - const assert = require('assert').strict; + const assert = require('internal/assert'); const fd = parseInt(process.env.NODE_CHANNEL_FD, 10); assert(fd >= 0); diff --git a/lib/internal/test/heap.js b/lib/internal/test/heap.js index 3f4a905fc5..52e00b9da5 100644 --- a/lib/internal/test/heap.js +++ b/lib/internal/test/heap.js @@ -5,7 +5,7 @@ process.emitWarning( 'internal/test/heap'); const { createHeapDump, buildEmbedderGraph } = internalBinding('heap_utils'); -const assert = require('assert'); +const assert = require('internal/assert'); // This is not suitable for production code. It creates a full V8 heap dump, // parses it as JSON, and then creates complex objects from it, leading @@ -44,9 +44,10 @@ function createJSHeapDump() { edgeIndex++; } - for (const node of nodes) - assert.strictEqual(node.edge_count, node.outgoingEdges.length); - + for (const node of nodes) { + assert(node.edge_count === node.outgoingEdges.length, + `${node.edge_count} !== ${node.outgoingEdges.length}`); + } return nodes; } |