Skip to content

Commit

Permalink
url: remove usage of require('util')
Browse files Browse the repository at this point in the history
PR-URL: #26808
Refs: #26546
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
  • Loading branch information
toshi1127 authored and targos committed Mar 27, 2019
1 parent 15af519 commit 04c7db3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions lib/internal/url.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const util = require('util');
const { inspect } = require('internal/util/inspect');
const {
encodeStr,
hexTable,
Expand Down Expand Up @@ -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');
}
Expand All @@ -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 = [];
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -368,7 +368,7 @@ class URL {
obj[context] = this[context];
}

return util.inspect(obj, opts);
return inspect(obj, opts);
}
}

Expand Down Expand Up @@ -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');

Expand All @@ -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 ')}`;
Expand Down

0 comments on commit 04c7db3

Please sign in to comment.