Skip to content

Commit 7e6a956

Browse files
TrottMylesBorins
Trott
authored and
MylesBorins
committed
test,lib,doc: use function declarations
Replace function expressions with function declarations in preparation for a lint rule requiring function declarations. PR-URL: #12711 Backport-PR-URL: #13774 Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
1 parent 6afa5fe commit 7e6a956

39 files changed

+130
-133
lines changed

‎doc/api/util.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ Returns `true` if the given `object` is a `Function`. Otherwise, returns
557557
const util = require('util');
558558

559559
function Foo() {}
560-
const Bar = function() {};
560+
const Bar = () => {};
561561

562562
util.isFunction({});
563563
// Returns: false

‎lib/_http_client.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ ClientRequest.prototype._deferToConnect = function(method, arguments_, cb) {
606606
cb();
607607
}
608608

609-
var onSocket = function() {
609+
var onSocket = () => {
610610
if (self.socket.writable) {
611611
callSocketMethod();
612612
} else {

‎lib/_tls_legacy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,9 @@ CryptoStream.prototype.destroySoon = function(err) {
425425
// was written on this side was read from the other side.
426426
var self = this;
427427
var waiting = 1;
428-
var finish = function() {
428+
function finish() {
429429
if (--waiting === 0) self.destroy();
430-
};
430+
}
431431
this._opposite.once('end', finish);
432432
if (!this._finished) {
433433
this.once('finish', finish);

‎lib/crypto.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,11 @@ function pbkdf2(password, salt, iterations, keylen, digest, callback) {
581581
// at this point, we need to handle encodings.
582582
var encoding = exports.DEFAULT_ENCODING;
583583
if (callback) {
584-
var next = function(er, ret) {
584+
function next(er, ret) {
585585
if (ret)
586586
ret = ret.toString(encoding);
587587
callback(er, ret);
588-
};
588+
}
589589
binding.PBKDF2(password, salt, iterations, keylen, digest, next);
590590
} else {
591591
var ret = binding.PBKDF2(password, salt, iterations, keylen, digest);

‎test/addons/make-callback/test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ const forward = vm.runInNewContext(`
5757
})
5858
`);
5959
// Runs in outer context.
60-
const endpoint = function($Object) {
60+
function endpoint($Object) {
6161
if (Object === $Object)
6262
throw new Error('bad');
6363
return Object;
64-
};
64+
}
6565
assert.strictEqual(Object, makeCallback(process, forward, endpoint));

‎test/inspector/inspector-helper.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function timeout(message, multiplicator) {
120120
TIMEOUT * (multiplicator || 1));
121121
}
122122

123-
const TestSession = function(socket, harness) {
123+
function TestSession(socket, harness) {
124124
this.mainScriptPath = harness.mainScriptPath;
125125
this.mainScriptId = null;
126126

@@ -145,7 +145,7 @@ const TestSession = function(socket, harness) {
145145
buffer = buffer.slice(consumed);
146146
} while (consumed);
147147
}).on('close', () => assert(this.expectClose_, 'Socket closed prematurely'));
148-
};
148+
}
149149

150150
TestSession.prototype.scriptUrlForId = function(id) {
151151
return this.scripts_[id];
@@ -302,7 +302,7 @@ TestSession.prototype.testHttpResponse = function(path, check) {
302302
};
303303

304304

305-
const Harness = function(port, childProcess) {
305+
function Harness(port, childProcess) {
306306
this.port = port;
307307
this.mainScriptPath = mainScript;
308308
this.stderrFilters_ = [];
@@ -327,7 +327,7 @@ const Harness = function(port, childProcess) {
327327
this.returnCode_ = code;
328328
this.running_ = false;
329329
});
330-
};
330+
}
331331

332332
Harness.prototype.addStderrFilter = function(regexp, callback) {
333333
this.stderrFilters_.push((message) => {

‎test/parallel/test-assert.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ try {
428428

429429
AnotherErrorType = class extends Error {};
430430

431-
const functionThatThrows = function() {
431+
const functionThatThrows = () => {
432432
throw new AnotherErrorType('foo');
433433
};
434434

@@ -471,6 +471,7 @@ a.throws(makeBlock(a.deepEqual, args, []));
471471

472472
// more checking that arguments objects are handled correctly
473473
{
474+
// eslint-disable-next-line func-style
474475
const returnArguments = function() { return arguments; };
475476

476477
const someArgs = returnArguments('a');

‎test/parallel/test-child-process-fork-dgram.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if (process.argv[2] === 'child') {
5757
});
5858
});
5959

60-
const sendMessages = function() {
60+
function sendMessages() {
6161
const serverPort = parentServer.address().port;
6262

6363
const timer = setInterval(function() {
@@ -81,7 +81,7 @@ if (process.argv[2] === 'child') {
8181
);
8282
}
8383
}, 1);
84-
};
84+
}
8585

8686
parentServer.bind(0, '127.0.0.1');
8787

‎test/parallel/test-child-process-fork-net.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (process.argv[2] === 'child') {
6666
}));
6767

6868
// send net.Server to child and test by connecting
69-
const testServer = function(callback) {
69+
function testServer(callback) {
7070

7171
// destroy server execute callback when done
7272
const progress = new ProgressTracker(2, function() {
@@ -95,7 +95,7 @@ if (process.argv[2] === 'child') {
9595
server.listen(0);
9696

9797
// handle client messages
98-
const messageHandlers = function(msg) {
98+
function messageHandlers(msg) {
9999

100100
if (msg.what === 'listening') {
101101
// make connections
@@ -117,13 +117,13 @@ if (process.argv[2] === 'child') {
117117
child.removeListener('message', messageHandlers);
118118
callback();
119119
}
120-
};
120+
}
121121

122122
child.on('message', messageHandlers);
123-
};
123+
}
124124

125125
// send net.Socket to child
126-
const testSocket = function(callback) {
126+
function testSocket(callback) {
127127

128128
// create a new server and connect to it,
129129
// but the socket will be handled by the child
@@ -158,7 +158,7 @@ if (process.argv[2] === 'child') {
158158
server.close();
159159
});
160160
});
161-
};
161+
}
162162

163163
// create server and send it to child
164164
let serverSuccess = false;

‎test/parallel/test-child-process-fork-net2.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ if (process.argv[2] === 'child') {
123123

124124
server.listen(0, '127.0.0.1');
125125

126-
let closeServer = function() {
126+
function closeServer() {
127127
server.close();
128128

129129
setTimeout(function() {
@@ -132,7 +132,7 @@ if (process.argv[2] === 'child') {
132132
child2.send('close');
133133
child3.disconnect();
134134
}, 200);
135-
};
135+
}
136136

137137
process.on('exit', function() {
138138
assert.strictEqual(disconnected, count);

0 commit comments

Comments
 (0)