benchmark: refactor for consistent style

Code in benchmark directory sometimes uses `function () {}` for anonymous callbacks and sometimes uses `() => {}`. Multi-line arrays sometimes have a trailing comma and sometimes do not. Update to always use arrow functions for anonymous callbacks and trailing commas for multiline arrays. PR-URL: nodejs#25944 Reviewed-By: Anto Aravinth <[email protected]> Reviewed-By: James M Snell <[email protected]>
Trott · Feb 7, 2019 · 29e74d4 · 29e74d4
1 parent d310d8d
commit 29e74d4
Show file tree

Hide file tree

Showing 96 changed files with 158 additions and 164 deletions.
diff --git a/benchmark/_cli.js b/benchmark/_cli.js
@@ -6,10 +6,8 @@ const path = require('path');
 // Create an object of all benchmark scripts
 const benchmarks = {};
 fs.readdirSync(__dirname)
-  .filter(function(name) {
-    return fs.statSync(path.resolve(__dirname, name)).isDirectory();
-  })
-  .forEach(function(category) {
+  .filter((name) => fs.statSync(path.resolve(__dirname, name)).isDirectory())
+  .forEach((category) => {
     benchmarks[category] = fs.readdirSync(path.resolve(__dirname, category))
       .filter((filename) => filename[0] !== '.' && filename[0] !== '_');
   });

diff --git a/benchmark/buffers/buffer-bytelength.js b/benchmark/buffers/buffer-bytelength.js
@@ -12,7 +12,7 @@ const chars = [
   'hello brendan!!!', // 1 byte
   'ΰαβγδεζηθικλμνξο', // 2 bytes
   '挰挱挲挳挴挵挶挷挸挹挺挻挼挽挾挿', // 3 bytes
-  '𠜎𠜱𠝹𠱓𠱸𠲖𠳏𠳕𠴕𠵼𠵿𠸎𠸏𠹷𠺝𠺢' // 4 bytes
+  '𠜎𠜱𠝹𠱓𠱸𠲖𠳏𠳕𠴕𠵼𠵿𠸎𠸏𠹷𠺝𠺢', // 4 bytes
 ];
 
 function main({ n, len, encoding }) {
@@ -33,9 +33,7 @@ function main({ n, len, encoding }) {
     }
 
     // Check the result to ensure it is *properly* optimized
-    results = strings.map(function(val) {
-      return Buffer.byteLength(val, encoding);
-    });
+    results = strings.map((val) => Buffer.byteLength(val, encoding));
   }
 
   bench.start();

diff --git a/benchmark/buffers/buffer-fill.js b/benchmark/buffers/buffer-fill.js
@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
     'fill("t", "utf8")',
     'fill("t", 0, "utf8")',
     'fill("t", 0)',
-    'fill(Buffer.alloc(1), 0)'
+    'fill(Buffer.alloc(1), 0)',
   ],
   size: [2 ** 8, 2 ** 13, 2 ** 16],
   n: [2e4]

diff --git a/benchmark/buffers/buffer-from.js b/benchmark/buffers/buffer-from.js
@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
     'string',
     'string-utf8',
     'string-base64',
-    'object'
+    'object',
   ],
   len: [10, 2048],
   n: [2048]

diff --git a/benchmark/buffers/buffer-indexof.js b/benchmark/buffers/buffer-indexof.js
@@ -18,7 +18,7 @@ const searchStrings = [
   'Soo--oop',
   'aaaaaaaaaaaaaaaaa',
   'venture to go near the house till she had brought herself down to',
-  '</i> to the Caterpillar'
+  '</i> to the Caterpillar',
 ];
 
 const bench = common.createBenchmark(main, {

diff --git a/benchmark/buffers/buffer-normalize-encoding.js b/benchmark/buffers/buffer-normalize-encoding.js
@@ -25,7 +25,7 @@ const bench = common.createBenchmark(main, {
     'utf16le',
     'UTF16LE',
     'utf8',
-    'UTF8'
+    'UTF8',
   ],
   n: [1e6]
 }, {

diff --git a/benchmark/buffers/buffer-read-with-byteLength.js b/benchmark/buffers/buffer-read-with-byteLength.js
@@ -5,7 +5,7 @@ const types = [
   'IntBE',
   'IntLE',
   'UIntBE',
-  'UIntLE'
+  'UIntLE',
 ];
 
 const bench = common.createBenchmark(main, {

diff --git a/benchmark/buffers/buffer-read.js b/benchmark/buffers/buffer-read.js
@@ -15,7 +15,7 @@ const types = [
   'FloatLE',
   'FloatBE',
   'DoubleLE',
-  'DoubleBE'
+  'DoubleBE',
 ];
 
 const bench = common.createBenchmark(main, {

diff --git a/benchmark/buffers/buffer-write-string.js b/benchmark/buffers/buffer-write-string.js
@@ -3,7 +3,7 @@
 const common = require('../common.js');
 const bench = common.createBenchmark(main, {
   encoding: [
-    '', 'utf8', 'ascii', 'hex', 'UCS-2', 'utf16le', 'latin1', 'binary'
+    '', 'utf8', 'ascii', 'hex', 'UCS-2', 'utf16le', 'latin1', 'binary',
   ],
   args: [ '', 'offset', 'offset+length' ],
   len: [10, 2048],

diff --git a/benchmark/buffers/buffer-write.js b/benchmark/buffers/buffer-write.js
@@ -19,7 +19,7 @@ const types = [
   'FloatLE',
   'FloatBE',
   'DoubleLE',
-  'DoubleBE'
+  'DoubleBE',
 ];
 
 const bench = common.createBenchmark(main, {

diff --git a/benchmark/buffers/dataview-set.js b/benchmark/buffers/dataview-set.js
@@ -15,7 +15,7 @@ const types = [
   'Float32LE',
   'Float32BE',
   'Float64LE',
-  'Float64BE'
+  'Float64BE',
 ];
 
 const bench = common.createBenchmark(main, {

diff --git a/benchmark/child_process/child-process-read-ipc.js b/benchmark/child_process/child-process-read-ipc.js
@@ -13,7 +13,7 @@ if (process.argv[2] === 'child') {
   const bench = common.createBenchmark(main, {
     len: [
       64, 256, 1024, 4096, 16384, 65536,
-      65536 << 4, 65536 << 8
+      65536 << 4, 65536 << 8,
     ],
     dur: [5]
   });
@@ -27,11 +27,9 @@ if (process.argv[2] === 'child') {
                         [process.argv[1], 'child', len], options);
 
     var bytes = 0;
-    child.on('message', function(msg) {
-      bytes += msg.length;
-    });
+    child.on('message', (msg) => { bytes += msg.length; });
 
-    setTimeout(function() {
+    setTimeout(() => {
       child.kill();
       bench.end(bytes);
     }, dur * 1000);

diff --git a/benchmark/child_process/child-process-read.js b/benchmark/child_process/child-process-read.js
@@ -25,11 +25,11 @@ function main({ dur, len }) {
   const child = child_process.spawn('yes', [msg], options);
 
   var bytes = 0;
-  child.stdout.on('data', function(msg) {
+  child.stdout.on('data', (msg) => {
     bytes += msg.length;
   });
 
-  setTimeout(function() {
+  setTimeout(() => {
     if (process.platform === 'win32') {
       // Sometimes there's a yes.exe process left hanging around on Windows...
       child_process.execSync(`taskkill /f /t /pid ${child.pid}`);

diff --git a/benchmark/child_process/spawn-echo.js b/benchmark/child_process/spawn-echo.js
@@ -15,7 +15,7 @@ function go(n, left) {
     return bench.end(n);
 
   const child = spawn('echo', ['hello']);
-  child.on('exit', function(code) {
+  child.on('exit', (code) => {
     if (code)
       process.exit(code);
     else

diff --git a/benchmark/cluster/echo.js b/benchmark/cluster/echo.js
@@ -61,7 +61,7 @@ if (cluster.isMaster) {
     }
   }
 } else {
-  process.on('message', function(msg) {
+  process.on('message', (msg) => {
     process.send(msg);
   });
 }
diff --git a/benchmark/compare.js b/benchmark/compare.js
@@ -72,7 +72,7 @@ if (showProgress) {
     execPath: cli.optional[job.binary]
   });
 
-  child.on('message', function(data) {
+  child.on('message', (data) => {
     if (data.type === 'report') {
       // Construct configuration string, " A=a, B=b, ..."
       let conf = '';
@@ -95,7 +95,7 @@ if (showProgress) {
     }
   });
 
-  child.once('close', function(code) {
+  child.once('close', (code) => {
     if (code) {
       process.exit(code);
       return;

diff --git a/benchmark/crypto/cipher-stream.js b/benchmark/crypto/cipher-stream.js
@@ -66,11 +66,11 @@ function main({ api, cipher, type, len, writes }) {
 
 function streamWrite(alice, bob, message, encoding, writes) {
   var written = 0;
-  bob.on('data', function(c) {
+  bob.on('data', (c) => {
     written += c.length;
   });
 
-  bob.on('end', function() {
+  bob.on('end', () => {
     // Gbits
     const bits = written * 8;
     const gbits = bits / (1024 * 1024 * 1024);

diff --git a/benchmark/crypto/rsa-encrypt-decrypt-throughput.js b/benchmark/crypto/rsa-encrypt-decrypt-throughput.js
@@ -9,7 +9,7 @@ const keylen_list = ['1024', '2048', '4096'];
 const RSA_PublicPem = {};
 const RSA_PrivatePem = {};
 
-keylen_list.forEach(function(key) {
+keylen_list.forEach((key) => {
   RSA_PublicPem[key] =
     fs.readFileSync(`${fixtures_keydir}/rsa_public_${key}.pem`);
   RSA_PrivatePem[key] =

diff --git a/benchmark/crypto/rsa-sign-verify-throughput.js b/benchmark/crypto/rsa-sign-verify-throughput.js
@@ -9,7 +9,7 @@ const keylen_list = ['1024', '2048'];
 const RSA_PublicPem = {};
 const RSA_PrivatePem = {};
 
-keylen_list.forEach(function(key) {
+keylen_list.forEach((key) => {
   RSA_PublicPem[key] =
     fs.readFileSync(`${fixtures_keydir}/rsa_public_${key}.pem`);
   RSA_PrivatePem[key] =

diff --git a/benchmark/dgram/array-vs-concat.js b/benchmark/dgram/array-vs-concat.js
@@ -43,11 +43,11 @@ function main({ dur, len, num, type, chunks }) {
     }
   }
 
-  socket.on('listening', function() {
+  socket.on('listening', () => {
     bench.start();
     onsend();
 
-    setTimeout(function() {
+    setTimeout(() => {
       const bytes = sent * len;
       const gbits = (bytes * 8) / (1024 * 1024 * 1024);
       bench.end(gbits);

diff --git a/benchmark/dgram/multi-buffer.js b/benchmark/dgram/multi-buffer.js
@@ -33,19 +33,19 @@ function main({ dur, len, num, type, chunks }) {
     }
   }
 
-  socket.on('listening', function() {
+  socket.on('listening', () => {
     bench.start();
     onsend();
 
-    setTimeout(function() {
+    setTimeout(() => {
       const bytes = (type === 'send' ? sent : received) * len;
       const gbits = (bytes * 8) / (1024 * 1024 * 1024);
       bench.end(gbits);
       process.exit(0);
     }, dur * 1000);
   });
 
-  socket.on('message', function() {
+  socket.on('message', () => {
     received++;
   });
 

diff --git a/benchmark/dgram/offset-length.js b/benchmark/dgram/offset-length.js
@@ -29,19 +29,19 @@ function main({ dur, len, num, type }) {
     }
   }
 
-  socket.on('listening', function() {
+  socket.on('listening', () => {
     bench.start();
     onsend();
 
-    setTimeout(function() {
+    setTimeout(() => {
       const bytes = (type === 'send' ? sent : received) * chunk.length;
       const gbits = (bytes * 8) / (1024 * 1024 * 1024);
       bench.end(gbits);
       process.exit(0);
     }, dur * 1000);
   });
 
-  socket.on('message', function() {
+  socket.on('message', () => {
     received++;
   });
 

diff --git a/benchmark/dgram/single-buffer.js b/benchmark/dgram/single-buffer.js
@@ -29,19 +29,19 @@ function main({ dur, len, num, type }) {
     }
   }
 
-  socket.on('listening', function() {
+  socket.on('listening', () => {
     bench.start();
     onsend();
 
-    setTimeout(function() {
+    setTimeout(() => {
       const bytes = (type === 'send' ? sent : received) * chunk.length;
       const gbits = (bytes * 8) / (1024 * 1024 * 1024);
       bench.end(gbits);
       process.exit(0);
     }, dur * 1000);
   });
 
-  socket.on('message', function() {
+  socket.on('message', () => {
     received++;
   });
 

diff --git a/benchmark/es/map-bench.js b/benchmark/es/map-bench.js
@@ -6,7 +6,7 @@ const assert = require('assert');
 const bench = common.createBenchmark(main, {
   method: [
     'object', 'nullProtoObject', 'nullProtoLiteralObject', 'storageObject',
-    'fakeMap', 'map'
+    'fakeMap', 'map',
   ],
   n: [1e6]
 });

diff --git a/benchmark/events/ee-add-remove.js b/benchmark/events/ee-add-remove.js
@@ -10,7 +10,7 @@ function main({ n }) {
 
   var k;
   for (k = 0; k < 10; k += 1)
-    listeners.push(function() {});
+    listeners.push(() => {});
 
   bench.start();
   for (var i = 0; i < n; i += 1) {

diff --git a/benchmark/events/ee-emit.js b/benchmark/events/ee-emit.js
@@ -12,7 +12,7 @@ function main({ n, argc, listeners }) {
   const ee = new EventEmitter();
 
   for (var k = 0; k < listeners; k += 1)
-    ee.on('dummy', function() {});
+    ee.on('dummy', () => {});
 
   var i;
   switch (argc) {

diff --git a/benchmark/events/ee-listener-count-on-prototype.js b/benchmark/events/ee-listener-count-on-prototype.js
@@ -8,8 +8,8 @@ function main({ n }) {
   const ee = new EventEmitter();
 
   for (var k = 0; k < 5; k += 1) {
-    ee.on('dummy0', function() {});
-    ee.on('dummy1', function() {});
+    ee.on('dummy0', () => {});
+    ee.on('dummy1', () => {});
   }
 
   bench.start();

diff --git a/benchmark/events/ee-listeners-many.js b/benchmark/events/ee-listeners-many.js
@@ -9,8 +9,8 @@ function main({ n }) {
   ee.setMaxListeners(101);
 
   for (var k = 0; k < 50; k += 1) {
-    ee.on('dummy0', function() {});
-    ee.on('dummy1', function() {});
+    ee.on('dummy0', () => {});
+    ee.on('dummy1', () => {});
   }
 
   bench.start();

diff --git a/benchmark/events/ee-listeners.js b/benchmark/events/ee-listeners.js
@@ -8,8 +8,8 @@ function main({ n }) {
   const ee = new EventEmitter();
 
   for (var k = 0; k < 5; k += 1) {
-    ee.on('dummy0', function() {});
-    ee.on('dummy1', function() {});
+    ee.on('dummy0', () => {});
+    ee.on('dummy1', () => {});
   }
 
   bench.start();

diff --git a/benchmark/fixtures/simple-http-server.js b/benchmark/fixtures/simple-http-server.js
@@ -13,14 +13,14 @@ const useDomains = process.env.NODE_USE_DOMAINS;
 if (useDomains) {
   var domain = require('domain');
   const gdom = domain.create();
-  gdom.on('error', function(er) {
+  gdom.on('error', (er) => {
     console.error('Error on global domain', er);
     throw er;
   });
   gdom.enter();
 }
 
-module.exports = http.createServer(function(req, res) {
+module.exports = http.createServer((req, res) => {
   if (useDomains) {
     const dom = domain.create();
     dom.add(req);

diff --git a/benchmark/fs/bench-readdir.js b/benchmark/fs/bench-readdir.js
@@ -17,7 +17,7 @@ function main({ n, dir, withFileTypes }) {
   (function r(cntr) {
     if (cntr-- <= 0)
       return bench.end(n);
-    fs.readdir(fullPath, { withFileTypes }, function() {
+    fs.readdir(fullPath, { withFileTypes }, () => {
       r(cntr);
     });
   }(n));
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ const bench = common.createBenchmark(main, { @@
         'utf16le',
         'UTF16LE',
         'utf8',
-        'UTF8'
+        'UTF8',
       ],
       n: [1e6]
     }, {
@@ Expand Down @@