doc: document deprecation of util._extend

.eslintrc

@@ -33,6 +33,16 @@ rules:
   no-unreachable: 2
   ## require valid typeof compared string like typeof foo === 'strnig'
   valid-typeof: 2
+  ## disallow controls characters in regular expressions
+  no-control-regex: 2
+  ## disallow extra boolean casts
+  no-extra-boolean-cast : 2
+  ## validate regular expressions
+  no-invalid-regexp: 2
+  ## forbid weird whitespace characters
+  no-irregular-whitespace: 2
+  ## avoid unexpected multiline expressions
+  no-unexpected-multiline: 2
 
   # Best Practices
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#best-practices

README.md

@@ -440,12 +440,12 @@ Releases of Node.js and io.js will be signed with one of the following GPG keys:
 
 * **Chris Dickinson** <christopher.s.dickinson@gmail.com> `9554F04D7259F04124DE6B476D5A82AC7E37093B`
 * **Colin Ihrig** <cjihrig@gmail.com> `94AE36675C464D64BAFA68DD7434390BDBE9B9C5`
-* **Sam Roberts** <octetcloud@keybase.io> `0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93`
-* **Jeremiah Senkpiel** <fishrock@keybase.io> `FD3A5288F042B6850C66B31F09FE44734EB7990E`
+* **Evan Lucas** <evanlucas@me.com> `B9AE9905FFD7803F25714661B63B535A4C206CA9`
 * **James M Snell** <jasnell@keybase.io> `71DCFD284A79C3B38668286BC97EC7A07EDE3FC1`
-* **Rod Vagg** <rod@vagg.org> `DD8F2338BAE7501E3DD5AC78C273792F7D83545D`
+* **Jeremiah Senkpiel** <fishrock@keybase.io> `FD3A5288F042B6850C66B31F09FE44734EB7990E`
 * **Myles Borins** <myles.borins@gmail.com> `C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8`
-* **Evan Lucas** <evanlucas@me.com> `B9AE9905FFD7803F25714661B63B535A4C206CA9`
+* **Rod Vagg** <rod@vagg.org> `DD8F2338BAE7501E3DD5AC78C273792F7D83545D`
+* **Sam Roberts** <octetcloud@keybase.io> `0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93`
 
 The full set of trusted release keys can be imported by running:
 
@@ -466,6 +466,6 @@ details on what to do with these keys to verify that a downloaded file is offici
 Previous releases of Node.js have been signed with one of the following GPG
 keys:
 
-* Julien Gilli <jgilli@fastmail.fm> `114F43EE0176B71C7BC219DD50A3051F888C628D`
-* Timothy J Fontaine <tjfontaine@gmail.com> `7937DFD2AB06298B2293C3187D33FF9D0246406D`
-* Isaac Z. Schlueter <i@izs.me> `93C7E9E91B49E432C2F75674B0A78B0A6C481CF6`
+* **Isaac Z. Schlueter** <i@izs.me> `93C7E9E91B49E432C2F75674B0A78B0A6C481CF6`
+* **Julien Gilli** <jgilli@fastmail.fm> `114F43EE0176B71C7BC219DD50A3051F888C628D`
+* **Timothy J Fontaine** <tjfontaine@gmail.com> `7937DFD2AB06298B2293C3187D33FF9D0246406D`

doc/api/addons.markdown

@@ -364,7 +364,7 @@ adding the function as a property of `exports`.
 
 To test it, run the following JavaScript:
 
-```cpp
+```js
 // test.js
 const addon = require('./build/Release/addon');
 

doc/api/buffer.markdown

@@ -1008,7 +1008,7 @@ When undefined, `offset` defaults to `0`, and `encoding` defaults to `'utf8'`.
 The `length` parameter is the number of bytes to write, when undefined `length`
 defaults to `buffer.length - offset`. If the Buffer did not contain enough
 space to fit the entire string, only a partial amount of the string will be
-written however, the will not write only partially encoded characters. The
+written however, it will not write only partially encoded characters. The
 return value indicates the number of octets written.
 
 ```js

doc/api/crypto.markdown

@@ -235,7 +235,7 @@ decipher.end();
 
 Example: Using `Decipher` and piped streams:
 
-```
+```js
 const crypto = require('crypto');
 const fs = require('fs');
 const decipher = crypto.createDecipher('aes192', 'a password');

doc/api/http.markdown

@@ -939,15 +939,15 @@ The 3-digit HTTP response status code. E.G. `404`.
 
 **Only valid for response obtained from [`http.ClientRequest`][].**
 
+The HTTP response status message (reason phrase). E.G. `OK` or `Internal Server Error`.
+
 ### message.socket
 
 The [`net.Socket`][] object associated with the connection.
 
 With HTTPS support, use [`request.socket.getPeerCertificate()`][] to obtain the
 client's authentication details.
 
-The HTTP response status message (reason phrase). E.G. `OK` or `Internal Server Error`.
-
 ### message.trailers
 
 The request/response trailers object. Only populated at the `'end'` event.

doc/api/https.markdown

@@ -185,6 +185,7 @@ The following options from [`tls.connect()`][] can also be specified. However, a
 - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
   SSL version 3. The possible values depend on your installation of
   OpenSSL and are defined in the constant [`SSL_METHODS`][].
+- `servername`: Servername for SNI (Server Name Indication) TLS extension.
 
 In order to specify these options, use a custom [`Agent`][].
 

doc/api/net.markdown

@@ -51,7 +51,8 @@ var server = net.createServer((socket) => {
 });
 
 // grab a random port.
-server.listen(() => {
+server.listen((err) => {
+  if (err) throw err;
   address = server.address();
   console.log('opened server on %j', address);
 });
@@ -528,7 +529,8 @@ Here is an example of a client of the previously described echo server:
 
 ```js
 const net = require('net');
-const client = net.connect({port: 8124}, () => { //'connect' listener
+const client = net.connect({port: 8124}, () => {
+  // 'connect' listener
   console.log('connected to server!');
   client.write('world!\r\n');
 });
@@ -581,8 +583,8 @@ Here is an example of a client of the previously described echo server:
 
 ```js
 const net = require('net');
-const client = net.connect({port: 8124},
-    () => { //'connect' listener
+const client = net.connect({port: 8124}, () => {
+  //'connect' listener
   console.log('connected to server!');
   client.write('world!\r\n');
 });
@@ -649,15 +651,18 @@ on port 8124:
 
 ```js
 const net = require('net');
-const server = net.createServer((c) => { //'connection' listener
+const server = net.createServer((c) => {
+  // 'connection' listener
   console.log('client connected');
   c.on('end', () => {
     console.log('client disconnected');
   });
   c.write('hello\r\n');
   c.pipe(c);
 });
-server.listen(8124, () => { //'listening' listener
+server.listen(8124, (err) => {
+  // 'listening' listener
+  if (err) throw err;
   console.log('server bound');
 });
 ```
@@ -672,7 +677,10 @@ To listen on the socket `/tmp/echo.sock` the third line from the last would
 just be changed to
 
 ```js
-server.listen('/tmp/echo.sock', () => { /* 'listening' listener*/ })
+server.listen('/tmp/echo.sock', (err) => {
+  // 'listening' listener
+  if (err) throw err;
+});
 ```
 
 Use `nc` to connect to a UNIX domain socket server:

doc/api/process.markdown

@@ -693,7 +693,7 @@ function MyThing(options) {
 
   process.nextTick(() => {
     this.startDoingStuff();
-  }.bind(this));
+  });
 }
 
 var thing = new MyThing();

doc/api/util.markdown

@@ -544,10 +544,21 @@ Deprecated predecessor of `console.log`.
 
 ## util.puts([...])
 
-    Stability: 0 - Deprecated: Use console.log() instead.
+    Stability: 0 - Deprecated: Use `console.log()` instead.
 
 Deprecated predecessor of `console.log`.
 
+
+## util._extend(obj)
+
+    Stability: 0 - Deprecated: Use Object.assign() instead.
+
+`_extend` was never intended to be used outside of internal NodeJS modules. The
+community found and used it.
+
+It is deprecated and should not be used in new code. JavaScript comes with very
+similar built in functionality through `Object.assign`. 
+
 [`Array.isArray`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray
 [constructor]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Object/constructor
 [Customizing `util.inspect` colors]: #util_customizing_util_inspect_colors

doc/api/vm.markdown

@@ -32,12 +32,18 @@ The options when creating a script are:
   displayed in stack traces
 - `columnOffset`: allows you to add an offset to the column number that is
   displayed in stack traces
-- `displayErrors`: whether or not to print any errors to stderr, with the
-  line of code that caused them highlighted, before throwing an exception.
-  Applies only to syntax errors compiling the code; errors while running the
-  code are controlled by the options to the script's methods.
+- `displayErrors`: if `true`, on error, attach the line of code that caused
+  the error to the stack trace. Applies only to syntax errors compiling the
+  code; errors while running the code are controlled by the options to the
+  script's methods.
 - `timeout`: a number of milliseconds to execute `code` before terminating
   execution. If execution is terminated, an [`Error`][] will be thrown.
+- `cachedData`: an optional `Buffer` with V8's code cache data for the supplied
+  source. When supplied `cachedDataRejected` value will be set to either
+  `true` or `false` depending on acceptance of the data by V8.
+- `produceCachedData`: if `true` and no `cachedData` is present - a `Buffer`
+  with V8's code cache data will be produced and stored in `cachedData` property
+  of the returned `vm.Script` instance.
 
 ### script.runInContext(contextifiedSandbox[, options])
 
@@ -144,10 +150,10 @@ The options for running a script are:
   displayed in stack traces
 - `columnOffset`: allows you to add an offset to the column number that is
   displayed in stack traces
-- `displayErrors`: whether or not to print any errors to stderr, with the
-  line of code that caused them highlighted, before throwing an exception.
-  Applies only to runtime errors executing the code; it is impossible to create
-  a `Script` instance with syntax errors, as the constructor will throw.
+- `displayErrors`: if `true`, on error, attach the line of code that caused
+  the error to the stack trace. Applies only to runtime errors executing the
+  code; it is impossible to create a `Script` instance with syntax errors, as
+  the constructor will throw.
 - `timeout`: a number of milliseconds to execute the script before terminating
   execution. If execution is terminated, an [`Error`][] will be thrown.
 
@@ -284,10 +290,10 @@ e.g. `(0,eval)('code')`. However, it also has the following additional options:
   displayed in stack traces
 - `columnOffset`: allows you to add an offset to the column number that is
   displayed in stack traces
-- `displayErrors`: whether or not to print any errors to stderr, with the
-  line of code that caused them highlighted, before throwing an exception.
-  Will capture both syntax errors from compiling `code` and runtime errors
-  thrown by executing the compiled code. Defaults to `true`.
+- `displayErrors`: if `true`, on error, attach the line of code that caused
+  the error to the stack trace. Will capture both syntax errors from compiling
+  `code` and runtime errors thrown by executing the compiled code. Defaults to
+  `true`.
 - `timeout`: a number of milliseconds to execute `code` before terminating
   execution. If execution is terminated, an [`Error`][] will be thrown.
 

lib/_stream_readable.js

@@ -130,10 +130,10 @@ function readableAddChunk(stream, state, chunk, encoding, addToFront) {
     onEofChunk(stream, state);
   } else if (state.objectMode || chunk && chunk.length > 0) {
     if (state.ended && !addToFront) {
-      var e = new Error('stream.push() after EOF');
+      const e = new Error('stream.push() after EOF');
       stream.emit('error', e);
     } else if (state.endEmitted && addToFront) {
-      var e = new Error('stream.unshift() after end event');
+      const e = new Error('stream.unshift() after end event');
       stream.emit('error', e);
     } else {
       if (state.decoder && !addToFront && !encoding)
@@ -640,13 +640,13 @@ Readable.prototype.unpipe = function(dest) {
     state.pipesCount = 0;
     state.flowing = false;
 
-    for (var i = 0; i < len; i++)
+    for (let i = 0; i < len; i++)
       dests[i].emit('unpipe', this);
     return this;
   }
 
   // try to find the right one.
-  var i = state.pipes.indexOf(dest);
+  const i = state.pipes.indexOf(dest);
   if (i === -1)
     return this;
 
@@ -847,7 +847,7 @@ function fromList(n, state) {
     if (n < list[0].length) {
       // just take a part of the first list item.
       // slice is the same for buffers and strings.
-      var buf = list[0];
+      const buf = list[0];
       ret = buf.slice(0, n);
       list[0] = buf.slice(n);
     } else if (n === list[0].length) {
@@ -863,7 +863,7 @@ function fromList(n, state) {
 
       var c = 0;
       for (var i = 0, l = list.length; i < l && c < n; i++) {
-        var buf = list[0];
+        const buf = list[0];
         var cpy = Math.min(n - c, buf.length);
 
         if (stringMode)

lib/_tls_common.js

@@ -48,7 +48,7 @@ exports.createSecureContext = function createSecureContext(options, context) {
   // cert's issuer in C++ code.
   if (options.ca) {
     if (Array.isArray(options.ca)) {
-      for (var i = 0, len = options.ca.length; i < len; i++) {
+      for (let i = 0, len = options.ca.length; i < len; i++) {
         c.context.addCACert(options.ca[i]);
       }
     } else {
@@ -60,7 +60,7 @@ exports.createSecureContext = function createSecureContext(options, context) {
 
   if (options.cert) {
     if (Array.isArray(options.cert)) {
-      for (var i = 0; i < options.cert.length; i++)
+      for (let i = 0; i < options.cert.length; i++)
         c.context.setCert(options.cert[i]);
     } else {
       c.context.setCert(options.cert);
@@ -73,7 +73,7 @@ exports.createSecureContext = function createSecureContext(options, context) {
   // which leads to the crash later on.
   if (options.key) {
     if (Array.isArray(options.key)) {
-      for (var i = 0; i < options.key.length; i++) {
+      for (let i = 0; i < options.key.length; i++) {
         var key = options.key[i];
 
         if (key.passphrase)
@@ -108,7 +108,7 @@ exports.createSecureContext = function createSecureContext(options, context) {
 
   if (options.crl) {
     if (Array.isArray(options.crl)) {
-      for (var i = 0, len = options.crl.length; i < len; i++) {
+      for (let i = 0, len = options.crl.length; i < len; i++) {
         c.context.addCRL(options.crl[i]);
       }
     } else {

lib/dns.js

@@ -189,6 +189,9 @@ exports.lookupService = function(host, port, callback) {
   if (cares.isIP(host) === 0)
     throw new TypeError('"host" argument needs to be a valid IP address');
 
+  if (typeof port !== 'number')
+    throw new TypeError(`"port" argument must be a number, got "${port}"`);
+
   callback = makeAsync(callback);
 
   var req = new GetNameInfoReqWrap();