Skip to content

Commit 2973c1f

Browse files
dnlupcodebytere
authored andcommittedMar 30, 2020
benchmark: use let and const instead of var
Use let and const in domain, es, events, fixtures, fs, http, http2 and misc. PR-URL: #31518 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 22a37d6 commit 2973c1f

35 files changed

+105
-111
lines changed
 

‎benchmark/domain/domain-fn-args.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function main({ n, args }) {
1515
bench.start();
1616

1717
bdomain.enter();
18-
for (var i = 0; i < n; i++) {
18+
for (let i = 0; i < n; i++) {
1919
if (myArguments.length >= 2) {
2020
const args = Array.prototype.slice.call(myArguments, 1);
2121
fn.apply(this, args);

‎benchmark/es/defaultparams-bench.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ function defaultParams(x = 1, y = 2) {
2222

2323
function runOldStyleDefaults(n) {
2424
bench.start();
25-
for (var i = 0; i < n; i++)
25+
for (let i = 0; i < n; i++)
2626
oldStyleDefaults();
2727
bench.end(n);
2828
}
2929

3030
function runDefaultParams(n) {
3131
bench.start();
32-
for (var i = 0; i < n; i++)
32+
for (let i = 0; i < n; i++)
3333
defaultParams();
3434
bench.end(n);
3535
}

‎benchmark/es/destructuring-bench.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ const bench = common.createBenchmark(main, {
99
});
1010

1111
function runSwapManual(n) {
12-
var x, y, r;
12+
let x, y, r;
1313
bench.start();
14-
for (var i = 0; i < n; i++) {
14+
for (let i = 0; i < n; i++) {
1515
x = 1, y = 2;
1616
r = x;
1717
x = y;
@@ -23,9 +23,9 @@ function runSwapManual(n) {
2323
}
2424

2525
function runSwapDestructured(n) {
26-
var x, y;
26+
let x, y;
2727
bench.start();
28-
for (var i = 0; i < n; i++) {
28+
for (let i = 0; i < n; i++) {
2929
x = 1, y = 2;
3030
[x, y] = [y, x];
3131
assert.strictEqual(x, 2);

‎benchmark/es/destructuring-object-bench.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ const bench = common.createBenchmark(main, {
88
});
99

1010
function runNormal(n) {
11-
var i = 0;
1211
const o = { x: 0, y: 1 };
1312
bench.start();
14-
for (; i < n; i++) {
13+
for (let i = 0; i < n; i++) {
1514
/* eslint-disable no-unused-vars */
1615
const x = o.x;
1716
const y = o.y;
@@ -22,10 +21,9 @@ function runNormal(n) {
2221
}
2322

2423
function runDestructured(n) {
25-
var i = 0;
2624
const o = { x: 0, y: 1 };
2725
bench.start();
28-
for (; i < n; i++) {
26+
for (let i = 0; i < n; i++) {
2927
/* eslint-disable no-unused-vars */
3028
const { x, y, r = 2 } = o;
3129
/* eslint-enable no-unused-vars */

‎benchmark/es/foreach-bench.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const bench = common.createBenchmark(main, {
1010

1111
function useFor(n, items, count) {
1212
bench.start();
13-
for (var i = 0; i < n; i++) {
14-
for (var j = 0; j < count; j++) {
13+
for (let i = 0; i < n; i++) {
14+
for (let j = 0; j < count; j++) {
1515
// eslint-disable-next-line no-unused-vars
1616
const item = items[j];
1717
}
@@ -21,7 +21,7 @@ function useFor(n, items, count) {
2121

2222
function useForOf(n, items) {
2323
bench.start();
24-
for (var i = 0; i < n; i++) {
24+
for (let i = 0; i < n; i++) {
2525
// eslint-disable-next-line no-unused-vars
2626
for (const item of items) {}
2727
}
@@ -30,8 +30,8 @@ function useForOf(n, items) {
3030

3131
function useForIn(n, items) {
3232
bench.start();
33-
for (var i = 0; i < n; i++) {
34-
for (var j in items) {
33+
for (let i = 0; i < n; i++) {
34+
for (const j in items) {
3535
// eslint-disable-next-line no-unused-vars
3636
const item = items[j];
3737
}
@@ -41,16 +41,16 @@ function useForIn(n, items) {
4141

4242
function useForEach(n, items) {
4343
bench.start();
44-
for (var i = 0; i < n; i++) {
44+
for (let i = 0; i < n; i++) {
4545
items.forEach((item) => {});
4646
}
4747
bench.end(n);
4848
}
4949

5050
function main({ n, count, method }) {
5151
const items = new Array(count);
52-
var fn;
53-
for (var i = 0; i < count; i++)
52+
let fn;
53+
for (let i = 0; i < count; i++)
5454
items[i] = i;
5555

5656
switch (method) {

‎benchmark/es/map-bench.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const bench = common.createBenchmark(main, {
1414
function runObject(n) {
1515
const m = {};
1616
bench.start();
17-
for (var i = 0; i < n; i++) {
17+
for (let i = 0; i < n; i++) {
1818
m[`i${i}`] = i;
1919
m[`s${i}`] = String(i);
2020
assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]);
@@ -27,7 +27,7 @@ function runObject(n) {
2727
function runNullProtoObject(n) {
2828
const m = Object.create(null);
2929
bench.start();
30-
for (var i = 0; i < n; i++) {
30+
for (let i = 0; i < n; i++) {
3131
m[`i${i}`] = i;
3232
m[`s${i}`] = String(i);
3333
assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]);
@@ -40,7 +40,7 @@ function runNullProtoObject(n) {
4040
function runNullProtoLiteralObject(n) {
4141
const m = { __proto__: null };
4242
bench.start();
43-
for (var i = 0; i < n; i++) {
43+
for (let i = 0; i < n; i++) {
4444
m[`i${i}`] = i;
4545
m[`s${i}`] = String(i);
4646
assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]);
@@ -56,7 +56,7 @@ StorageObject.prototype = Object.create(null);
5656
function runStorageObject(n) {
5757
const m = new StorageObject();
5858
bench.start();
59-
for (var i = 0; i < n; i++) {
59+
for (let i = 0; i < n; i++) {
6060
m[`i${i}`] = i;
6161
m[`s${i}`] = String(i);
6262
assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]);
@@ -79,7 +79,7 @@ function fakeMap() {
7979
function runFakeMap(n) {
8080
const m = fakeMap();
8181
bench.start();
82-
for (var i = 0; i < n; i++) {
82+
for (let i = 0; i < n; i++) {
8383
m.set(`i${i}`, i);
8484
m.set(`s${i}`, String(i));
8585
assert.strictEqual(String(m.get(`i${i}`)), m.get(`s${i}`));
@@ -92,7 +92,7 @@ function runFakeMap(n) {
9292
function runMap(n) {
9393
const m = new Map();
9494
bench.start();
95-
for (var i = 0; i < n; i++) {
95+
for (let i = 0; i < n; i++) {
9696
m.set(`i${i}`, i);
9797
m.set(`s${i}`, String(i));
9898
assert.strictEqual(String(m.get(`i${i}`)), m.get(`s${i}`));

‎benchmark/es/restparams-bench.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
1111
function copyArguments() {
1212
const len = arguments.length;
1313
const args = new Array(len);
14-
for (var i = 0; i < len; i++)
14+
for (let i = 0; i < len; i++)
1515
args[i] = arguments[i];
1616
assert.strictEqual(args[0], 1);
1717
assert.strictEqual(args[1], 2);
@@ -34,22 +34,22 @@ function useArguments() {
3434
}
3535

3636
function runCopyArguments(n) {
37-
for (var i = 0; i < n; i++)
37+
for (let i = 0; i < n; i++)
3838
copyArguments(1, 2, 'a', 'b');
3939
}
4040

4141
function runRestArguments(n) {
42-
for (var i = 0; i < n; i++)
42+
for (let i = 0; i < n; i++)
4343
restArguments(1, 2, 'a', 'b');
4444
}
4545

4646
function runUseArguments(n) {
47-
for (var i = 0; i < n; i++)
47+
for (let i = 0; i < n; i++)
4848
useArguments(1, 2, 'a', 'b');
4949
}
5050

5151
function main({ n, method }) {
52-
var fn;
52+
let fn;
5353
switch (method) {
5454
case '':
5555
// Empty string falls through to next line as default, mostly for tests.

‎benchmark/es/spread-assign.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,25 @@ function main({ n, context, count, rest, method }) {
1616
src[`p${n}`] = n;
1717

1818
let obj; // eslint-disable-line no-unused-vars
19-
let i;
2019

2120
switch (method) {
2221
case '':
2322
// Empty string falls through to next line as default, mostly for tests.
2423
case '_extend':
2524
bench.start();
26-
for (i = 0; i < n; i++)
25+
for (let i = 0; i < n; i++)
2726
obj = util._extend({}, src);
2827
bench.end(n);
2928
break;
3029
case 'assign':
3130
bench.start();
32-
for (i = 0; i < n; i++)
31+
for (let i = 0; i < n; i++)
3332
obj = Object.assign({}, src);
3433
bench.end(n);
3534
break;
3635
case 'spread':
3736
bench.start();
38-
for (i = 0; i < n; i++)
37+
for (let i = 0; i < n; i++)
3938
obj = { ...src };
4039
bench.end(n);
4140
break;

‎benchmark/es/spread-bench.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@ function makeTest(count, rest) {
2525

2626
function main({ n, context, count, rest, method }) {
2727
const ctx = context === 'context' ? {} : null;
28-
var fn = makeTest(count, rest);
28+
let fn = makeTest(count, rest);
2929
const args = new Array(count);
30-
var i;
31-
for (i = 0; i < count; i++)
30+
31+
for (let i = 0; i < count; i++)
3232
args[i] = i;
3333

3434
switch (method) {
3535
case '':
3636
// Empty string falls through to next line as default, mostly for tests.
3737
case 'apply':
3838
bench.start();
39-
for (i = 0; i < n; i++)
39+
for (let i = 0; i < n; i++)
4040
fn.apply(ctx, args);
4141
bench.end(n);
4242
break;
4343
case 'spread':
4444
if (ctx !== null)
4545
fn = fn.bind(ctx);
4646
bench.start();
47-
for (i = 0; i < n; i++)
47+
for (let i = 0; i < n; i++)
4848
fn(...args);
4949
bench.end(n);
5050
break;
5151
case 'call-spread':
5252
bench.start();
53-
for (i = 0; i < n; i++)
53+
for (let i = 0; i < n; i++)
5454
fn.call(ctx, ...args);
5555
bench.end(n);
5656
break;

‎benchmark/events/ee-add-remove.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ function main({ n }) {
88
const ee = new events.EventEmitter();
99
const listeners = [];
1010

11-
var k;
12-
for (k = 0; k < 10; k += 1)
11+
for (let k = 0; k < 10; k += 1)
1312
listeners.push(() => {});
1413

1514
bench.start();
16-
for (var i = 0; i < n; i += 1) {
15+
for (let i = 0; i < n; i += 1) {
1716
const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1';
18-
for (k = listeners.length; --k >= 0; /* empty */) {
17+
for (let k = listeners.length; --k >= 0; /* empty */) {
1918
ee.on(dummy, listeners[k]);
2019
}
21-
for (k = listeners.length; --k >= 0; /* empty */) {
20+
for (let k = listeners.length; --k >= 0; /* empty */) {
2221
ee.removeListener(dummy, listeners[k]);
2322
}
2423
}

‎benchmark/events/ee-emit.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,34 @@ const bench = common.createBenchmark(main, {
1111
function main({ n, argc, listeners }) {
1212
const ee = new EventEmitter();
1313

14-
for (var k = 0; k < listeners; k += 1)
14+
for (let k = 0; k < listeners; k += 1)
1515
ee.on('dummy', () => {});
1616

17-
var i;
1817
switch (argc) {
1918
case 2:
2019
bench.start();
21-
for (i = 0; i < n; i += 1) {
20+
for (let i = 0; i < n; i += 1) {
2221
ee.emit('dummy', true, 5);
2322
}
2423
bench.end(n);
2524
break;
2625
case 4:
2726
bench.start();
28-
for (i = 0; i < n; i += 1) {
27+
for (let i = 0; i < n; i += 1) {
2928
ee.emit('dummy', true, 5, 10, false);
3029
}
3130
bench.end(n);
3231
break;
3332
case 10:
3433
bench.start();
35-
for (i = 0; i < n; i += 1) {
34+
for (let i = 0; i < n; i += 1) {
3635
ee.emit('dummy', true, 5, 10, false, 5, 'string', true, false, 11, 20);
3736
}
3837
bench.end(n);
3938
break;
4039
default:
4140
bench.start();
42-
for (i = 0; i < n; i += 1) {
41+
for (let i = 0; i < n; i += 1) {
4342
ee.emit('dummy');
4443
}
4544
bench.end(n);

‎benchmark/events/ee-listener-count-on-prototype.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ const bench = common.createBenchmark(main, { n: [5e7] });
77
function main({ n }) {
88
const ee = new EventEmitter();
99

10-
for (var k = 0; k < 5; k += 1) {
10+
for (let k = 0; k < 5; k += 1) {
1111
ee.on('dummy0', () => {});
1212
ee.on('dummy1', () => {});
1313
}
1414

1515
bench.start();
16-
for (var i = 0; i < n; i += 1) {
16+
for (let i = 0; i < n; i += 1) {
1717
const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1';
1818
ee.listenerCount(dummy);
1919
}

‎benchmark/events/ee-listeners-many.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ function main({ n }) {
88
const ee = new EventEmitter();
99
ee.setMaxListeners(101);
1010

11-
for (var k = 0; k < 50; k += 1) {
11+
for (let k = 0; k < 50; k += 1) {
1212
ee.on('dummy0', () => {});
1313
ee.on('dummy1', () => {});
1414
}
1515

1616
bench.start();
17-
for (var i = 0; i < n; i += 1) {
17+
for (let i = 0; i < n; i += 1) {
1818
const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1';
1919
ee.listeners(dummy);
2020
}

‎benchmark/events/ee-listeners.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ const bench = common.createBenchmark(main, { n: [5e6] });
77
function main({ n }) {
88
const ee = new EventEmitter();
99

10-
for (var k = 0; k < 5; k += 1) {
10+
for (let k = 0; k < 5; k += 1) {
1111
ee.on('dummy0', () => {});
1212
ee.on('dummy1', () => {});
1313
}
1414

1515
bench.start();
16-
for (var i = 0; i < n; i += 1) {
16+
for (let i = 0; i < n; i += 1) {
1717
const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1';
1818
ee.listeners(dummy);
1919
}

0 commit comments

Comments
 (0)
Please sign in to comment.