Skip to content

Commit 804e7aa

Browse files
cjihrigcjihrig
committed
lib: use const to define constants
This commit replaces a number of var statements throughout the lib code with const statements. PR-URL: #541 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent 803883b commit 804e7aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+403
-416
lines changed

‎lib/_debug_agent.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
'use strict';
22

3-
var assert = require('assert');
4-
var net = require('net');
5-
var util = require('util');
6-
var Buffer = require('buffer').Buffer;
7-
8-
var Transform = require('stream').Transform;
3+
const assert = require('assert');
4+
const net = require('net');
5+
const util = require('util');
6+
const Buffer = require('buffer').Buffer;
7+
const Transform = require('stream').Transform;
98

109
exports.start = function start() {
1110
var agent = new Agent();
1211

1312
// Do not let `agent.listen()` request listening from cluster master
14-
var cluster = require('cluster');
13+
const cluster = require('cluster');
1514
cluster.isWorker = false;
1615
cluster.isMaster = true;
1716

‎lib/_debugger.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
'use strict';
22

3-
var util = require('util'),
4-
path = require('path'),
5-
net = require('net'),
6-
vm = require('vm'),
7-
module = require('module'),
8-
repl = module.requireRepl(),
9-
inherits = util.inherits,
10-
assert = require('assert'),
11-
spawn = require('child_process').spawn;
3+
const util = require('util');
4+
const path = require('path');
5+
const net = require('net');
6+
const vm = require('vm');
7+
const module = require('module');
8+
const repl = module.requireRepl();
9+
const inherits = util.inherits;
10+
const assert = require('assert');
11+
const spawn = require('child_process').spawn;
1212

1313
exports.start = function(argv, stdin, stdout) {
1414
argv || (argv = process.argv.slice(2));
@@ -137,7 +137,7 @@ Protocol.prototype.serialize = function(req) {
137137
};
138138

139139

140-
var NO_FRAME = -1;
140+
const NO_FRAME = -1;
141141

142142
function Client() {
143143
net.Stream.call(this);
@@ -176,7 +176,7 @@ Client.prototype._addHandle = function(desc) {
176176
};
177177

178178

179-
var natives = process.binding('natives');
179+
const natives = process.binding('natives');
180180

181181

182182
Client.prototype._addScript = function(desc) {
@@ -645,7 +645,7 @@ Client.prototype.fullTrace = function(cb) {
645645

646646

647647

648-
var commands = [
648+
const commands = [
649649
[
650650
'run (r)',
651651
'cont (c)',
@@ -772,22 +772,22 @@ function Interface(stdin, stdout, args) {
772772
process.once('SIGTERM', process.exit.bind(process, 0));
773773
process.once('SIGHUP', process.exit.bind(process, 0));
774774

775-
var proto = Interface.prototype,
776-
ignored = ['pause', 'resume', 'exitRepl', 'handleBreak',
777-
'requireConnection', 'killChild', 'trySpawn',
778-
'controlEval', 'debugEval', 'print', 'childPrint',
779-
'clearline'],
780-
shortcut = {
781-
'run': 'r',
782-
'cont': 'c',
783-
'next': 'n',
784-
'step': 's',
785-
'out': 'o',
786-
'backtrace': 'bt',
787-
'setBreakpoint': 'sb',
788-
'clearBreakpoint': 'cb',
789-
'pause_': 'pause'
790-
};
775+
var proto = Interface.prototype;
776+
const ignored = ['pause', 'resume', 'exitRepl', 'handleBreak',
777+
'requireConnection', 'killChild', 'trySpawn',
778+
'controlEval', 'debugEval', 'print', 'childPrint',
779+
'clearline'];
780+
const shortcut = {
781+
'run': 'r',
782+
'cont': 'c',
783+
'next': 'n',
784+
'step': 's',
785+
'out': 'o',
786+
'backtrace': 'bt',
787+
'setBreakpoint': 'sb',
788+
'clearBreakpoint': 'cb',
789+
'pause_': 'pause'
790+
};
791791

792792
function defineProperty(key, protoKey) {
793793
// Check arity

‎lib/_http_agent.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

3-
var net = require('net');
4-
var util = require('util');
5-
var EventEmitter = require('events').EventEmitter;
6-
var debug = util.debuglog('http');
3+
const net = require('net');
4+
const util = require('util');
5+
const EventEmitter = require('events').EventEmitter;
6+
const debug = util.debuglog('http');
77

88
// New Agent code.
99

‎lib/_http_client.js‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
'use strict';
22

3-
var util = require('util');
4-
var net = require('net');
5-
var url = require('url');
6-
var EventEmitter = require('events').EventEmitter;
7-
var HTTPParser = process.binding('http_parser').HTTPParser;
8-
var assert = require('assert').ok;
9-
10-
var common = require('_http_common');
11-
12-
var httpSocketSetup = common.httpSocketSetup;
13-
var parsers = common.parsers;
14-
var freeParser = common.freeParser;
15-
var debug = common.debug;
16-
17-
var OutgoingMessage = require('_http_outgoing').OutgoingMessage;
18-
19-
var Agent = require('_http_agent');
3+
const util = require('util');
4+
const net = require('net');
5+
const url = require('url');
6+
const EventEmitter = require('events').EventEmitter;
7+
const HTTPParser = process.binding('http_parser').HTTPParser;
8+
const assert = require('assert').ok;
9+
const common = require('_http_common');
10+
const httpSocketSetup = common.httpSocketSetup;
11+
const parsers = common.parsers;
12+
const freeParser = common.freeParser;
13+
const debug = common.debug;
14+
const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
15+
const Agent = require('_http_agent');
2016

2117

2218
function ClientRequest(options, cb) {
@@ -56,7 +52,8 @@ function ClientRequest(options, cb) {
5652
'Expected "' + expectedProtocol + '".');
5753
}
5854

59-
var defaultPort = options.defaultPort || self.agent && self.agent.defaultPort;
55+
const defaultPort = options.defaultPort ||
56+
self.agent && self.agent.defaultPort;
6057

6158
var port = options.port = options.port || defaultPort || 80;
6259
var host = options.host = options.hostname || options.host || 'localhost';

‎lib/_http_common.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
'use strict';
22

3-
var FreeList = require('freelist').FreeList;
4-
var HTTPParser = process.binding('http_parser').HTTPParser;
3+
const FreeList = require('freelist').FreeList;
4+
const HTTPParser = process.binding('http_parser').HTTPParser;
55

6-
var incoming = require('_http_incoming');
7-
var IncomingMessage = incoming.IncomingMessage;
8-
var readStart = incoming.readStart;
9-
var readStop = incoming.readStop;
6+
const incoming = require('_http_incoming');
7+
const IncomingMessage = incoming.IncomingMessage;
8+
const readStart = incoming.readStart;
9+
const readStop = incoming.readStop;
1010

11-
var isNumber = require('util').isNumber;
12-
var debug = require('util').debuglog('http');
11+
const isNumber = require('util').isNumber;
12+
const debug = require('util').debuglog('http');
1313
exports.debug = debug;
1414

1515
exports.CRLF = '\r\n';
1616
exports.chunkExpression = /chunk/i;
1717
exports.continueExpression = /100-continue/i;
1818
exports.methods = HTTPParser.methods;
1919

20-
var kOnHeaders = HTTPParser.kOnHeaders | 0;
21-
var kOnHeadersComplete = HTTPParser.kOnHeadersComplete | 0;
22-
var kOnBody = HTTPParser.kOnBody | 0;
23-
var kOnMessageComplete = HTTPParser.kOnMessageComplete | 0;
20+
const kOnHeaders = HTTPParser.kOnHeaders | 0;
21+
const kOnHeadersComplete = HTTPParser.kOnHeadersComplete | 0;
22+
const kOnBody = HTTPParser.kOnBody | 0;
23+
const kOnMessageComplete = HTTPParser.kOnMessageComplete | 0;
2424

2525
// Only called in the slow case where slow means
2626
// that the request headers were either fragmented

‎lib/_http_incoming.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var util = require('util');
4-
var Stream = require('stream');
3+
const util = require('util');
4+
const Stream = require('stream');
55

66
function readStart(socket) {
77
if (socket && !socket._paused && socket.readable)

‎lib/_http_outgoing.js‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
'use strict';
22

3-
var assert = require('assert').ok;
4-
var Stream = require('stream');
5-
var timers = require('timers');
6-
var util = require('util');
7-
8-
var common = require('_http_common');
9-
10-
var CRLF = common.CRLF;
11-
var chunkExpression = common.chunkExpression;
12-
var debug = common.debug;
13-
14-
15-
var connectionExpression = /Connection/i;
16-
var transferEncodingExpression = /Transfer-Encoding/i;
17-
var closeExpression = /close/i;
18-
var contentLengthExpression = /Content-Length/i;
19-
var dateExpression = /Date/i;
20-
var expectExpression = /Expect/i;
21-
22-
var automaticHeaders = {
3+
const assert = require('assert').ok;
4+
const Stream = require('stream');
5+
const timers = require('timers');
6+
const util = require('util');
7+
const common = require('_http_common');
8+
9+
const CRLF = common.CRLF;
10+
const chunkExpression = common.chunkExpression;
11+
const debug = common.debug;
12+
13+
const connectionExpression = /Connection/i;
14+
const transferEncodingExpression = /Transfer-Encoding/i;
15+
const closeExpression = /close/i;
16+
const contentLengthExpression = /Content-Length/i;
17+
const dateExpression = /Date/i;
18+
const expectExpression = /Expect/i;
19+
20+
const automaticHeaders = {
2321
connection: true,
2422
'content-length': true,
2523
'transfer-encoding': true,
@@ -477,7 +475,7 @@ OutgoingMessage.prototype.addTrailers = function(headers) {
477475
};
478476

479477

480-
var crlf_buf = new Buffer('\r\n');
478+
const crlf_buf = new Buffer('\r\n');
481479

482480

483481
OutgoingMessage.prototype.end = function(data, encoding, callback) {

‎lib/_http_server.js‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
'use strict';
22

3-
var util = require('util');
4-
var net = require('net');
5-
var EventEmitter = require('events').EventEmitter;
6-
var HTTPParser = process.binding('http_parser').HTTPParser;
7-
var assert = require('assert').ok;
8-
9-
var common = require('_http_common');
10-
var parsers = common.parsers;
11-
var freeParser = common.freeParser;
12-
var debug = common.debug;
13-
var CRLF = common.CRLF;
14-
var continueExpression = common.continueExpression;
15-
var chunkExpression = common.chunkExpression;
16-
var httpSocketSetup = common.httpSocketSetup;
17-
18-
var OutgoingMessage = require('_http_outgoing').OutgoingMessage;
19-
20-
21-
var STATUS_CODES = exports.STATUS_CODES = {
3+
const util = require('util');
4+
const net = require('net');
5+
const EventEmitter = require('events').EventEmitter;
6+
const HTTPParser = process.binding('http_parser').HTTPParser;
7+
const assert = require('assert').ok;
8+
const common = require('_http_common');
9+
const parsers = common.parsers;
10+
const freeParser = common.freeParser;
11+
const debug = common.debug;
12+
const CRLF = common.CRLF;
13+
const continueExpression = common.continueExpression;
14+
const chunkExpression = common.chunkExpression;
15+
const httpSocketSetup = common.httpSocketSetup;
16+
const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
17+
18+
const STATUS_CODES = exports.STATUS_CODES = {
2219
100 : 'Continue',
2320
101 : 'Switching Protocols',
2421
102 : 'Processing', // RFC 2518, obsoleted by RFC 4918

‎lib/_stream_duplex.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
'use strict';
77

88
module.exports = Duplex;
9-
var util = require('util');
10-
var Readable = require('_stream_readable');
11-
var Writable = require('_stream_writable');
9+
10+
const util = require('util');
11+
const Readable = require('_stream_readable');
12+
const Writable = require('_stream_writable');
1213

1314
util.inherits(Duplex, Readable);
1415

‎lib/_stream_passthrough.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
module.exports = PassThrough;
88

9-
var Transform = require('_stream_transform');
10-
var util = require('util');
9+
const Transform = require('_stream_transform');
10+
const util = require('util');
1111
util.inherits(PassThrough, Transform);
1212

1313
function PassThrough(options) {

0 commit comments

Comments
 (0)