From 04c7db3638fae057837d7eda726fdca832b90f17 Mon Sep 17 00:00:00 2001 From: toshi1127 Date: Wed, 20 Mar 2019 21:34:03 +0900 Subject: [PATCH] url: remove usage of require('util') PR-URL: https://github.com/nodejs/node/pull/26808 Refs: https://github.com/nodejs/node/issues/26546 Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater Reviewed-By: Yongsheng Zhang --- lib/internal/url.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/internal/url.js b/lib/internal/url.js index c2e2519b6e2334..f5295e98dfb52e 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -1,6 +1,6 @@ 'use strict'; -const util = require('util'); +const { inspect } = require('internal/util/inspect'); const { encodeStr, hexTable, @@ -184,7 +184,7 @@ class URLSearchParams { this[context] = null; } - [util.inspect.custom](recurseTimes, ctx) { + [inspect.custom](recurseTimes, ctx) { if (!this || !this[searchParams] || this[searchParams][searchParams]) { throw new ERR_INVALID_THIS('URLSearchParams'); } @@ -197,7 +197,7 @@ class URLSearchParams { if (recurseTimes !== null) { innerOpts.depth = recurseTimes - 1; } - var innerInspect = (v) => util.inspect(v, innerOpts); + var innerInspect = (v) => inspect(v, innerOpts); var list = this[searchParams]; var output = []; @@ -334,7 +334,7 @@ class URL { scheme === 'file:'); } - [util.inspect.custom](depth, opts) { + [inspect.custom](depth, opts) { if (this == null || Object.getPrototypeOf(this[context]) !== URLContext.prototype) { throw new ERR_INVALID_THIS('URL'); @@ -368,7 +368,7 @@ class URL { obj[context] = this[context]; } - return util.inspect(obj, opts); + return inspect(obj, opts); } } @@ -1194,7 +1194,7 @@ defineIDLClass(URLSearchParamsIteratorPrototype, 'URLSearchParams Iterator', { done: false }; }, - [util.inspect.custom](recurseTimes, ctx) { + [inspect.custom](recurseTimes, ctx) { if (this == null || this[context] == null || this[context].target == null) throw new ERR_INVALID_THIS('URLSearchParamsIterator'); @@ -1221,8 +1221,8 @@ defineIDLClass(URLSearchParamsIteratorPrototype, 'URLSearchParams Iterator', { } return prev; }, []); - const breakLn = util.inspect(output, innerOpts).includes('\n'); - const outputStrs = output.map((p) => util.inspect(p, innerOpts)); + const breakLn = inspect(output, innerOpts).includes('\n'); + const outputStrs = output.map((p) => inspect(p, innerOpts)); let outputStr; if (breakLn) { outputStr = `\n ${outputStrs.join(',\n ')}`;