Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

url,tools,benchmark: replace deprecated substr() #51546

Merged
merged 1 commit into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ module.exports = {
selector: 'ThrowStatement > CallExpression[callee.name=/Error$/]',
message: 'Use `new` keyword when throwing an `Error`.',
},
{
selector: "CallExpression[callee.property.name='substr']",
message: 'Use String.prototype.slice() or String.prototype.substring() instead of String.prototype.substr()',
},
{
selector: "CallExpression[callee.name='isNaN']",
message: 'Use Number.isNaN() instead of the global isNaN() function.',
Expand Down
2 changes: 1 addition & 1 deletion benchmark/http/bench-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function main({ len, n }) {
let header = `GET /hello HTTP/1.1${CRLF}Content-Type: text/plain${CRLF}`;

for (let i = 0; i < len; i++) {
header += `X-Filler${i}: ${Math.random().toString(36).substr(2)}${CRLF}`;
header += `X-Filler${i}: ${Math.random().toString(36).substring(2)}${CRLF}`;
}
header += CRLF;

Expand Down
2 changes: 1 addition & 1 deletion lib/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ Url.prototype.resolveObject = function resolveObject(relative) {
srcPath.unshift('');
}

if (hasTrailingSlash && (srcPath.join('/').substr(-1) !== '/')) {
if (hasTrailingSlash && (srcPath.join('/').slice(-1) !== '/')) {
srcPath.push('');
}

Expand Down
4 changes: 2 additions & 2 deletions tools/doc/html.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,8 @@ function versionSort(a, b) {
b = minVersion(b).trim();
let i = 0; // Common prefix length.
while (i < a.length && i < b.length && a[i] === b[i]) i++;
a = a.substr(i);
b = b.substr(i);
a = a.substring(i);
b = b.substring(i);
return +b.match(numberRe)[0] - +a.match(numberRe)[0];
}

Expand Down
4 changes: 2 additions & 2 deletions tools/doc/json.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ function parseSignature(text, sig) {

const eq = sigParam.indexOf('=');
if (eq !== -1) {
defaultValue = sigParam.substr(eq + 1);
sigParam = sigParam.substr(0, eq);
defaultValue = sigParam.substring(eq + 1);
sigParam = sigParam.substring(0, eq);
}

// At this point, the name should match. If it doesn't find one that does.
Expand Down