Merge remote-tracking branch 'nodejs/master' into chnext

.eslintignore

@@ -1,7 +1,7 @@
 lib/internal/v8_prof_polyfill.js
 lib/internal/v8_prof_processor.js
 lib/punycode.js
-test/addons/doc-*/
+test/addons/??_*/
 test/fixtures
 test/**/node_modules
 test/disabled

.eslintrc

@@ -27,8 +27,6 @@ rules:
   no-duplicate-case: 2
   ## disallow assignment of exceptional params
   no-ex-assign: 2
-  ## disallow use of reserved words as keys like enum, class
-  no-reserved-keys: 2
   ## disallow unreachable code
   no-unreachable: 2
   ## require valid typeof compared string like typeof foo === 'strnig'
@@ -44,7 +42,7 @@ rules:
   ## use single quote, we can use double quote when escape chars
   quotes: [2, "single", "avoid-escape"]
   ## 2 space indentation
-  indent: [2, 2]
+  indent: [2, 2, {SwitchCase: 1}]
   ## add space after comma
   comma-spacing: 2
   ## put semi-colon
@@ -84,6 +82,8 @@ rules:
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#variables
   ## disallow use of undefined variables (globals)
   no-undef: 2
+  ## disallow declaration of variables that are not used in the code
+  no-unused-vars: [2, {"args": "none"}]
 
   # Custom rules in tools/eslint-rules
   require-buffer: 2
@@ -110,5 +110,3 @@ globals:
   DTRACE_NET_SERVER_CONNECTION         : false
   LTTNG_NET_SERVER_CONNECTION          : false
   COUNTER_NET_SERVER_CONNECTION        : false
-  escape                               : false
-  unescape                             : false

.gitignore

@@ -24,7 +24,7 @@ icu_config.gypi
 
 # various stuff that VC++ produces/uses
 Debug/
-!deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug
+!**/node_modules/debug/
 !deps/v8/src/debug/
 Release/
 !doc/blog/**
@@ -52,7 +52,7 @@ ipch/
 /npm.wxs
 /tools/msvs/npm.wixobj
 /tools/osx-pkg.pmdoc/index.xml
-/test/addons/doc-*/
+/test/addons/??_*/
 email.md
 deps/v8-*
 deps/icu

Makefile

@@ -105,12 +105,12 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
 
 # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
 test/addons/.docbuildstamp: doc/api/addons.markdown
-	$(RM) -r test/addons/doc-*/
+	$(RM) -r test/addons/??_*/
 	$(NODE) tools/doc/addon-verify.js
 	touch $@
 
 ADDONS_BINDING_GYPS := \
-	$(filter-out test/addons/doc-*/binding.gyp, \
+	$(filter-out test/addons/??_*/binding.gyp, \
 		$(wildcard test/addons/*/binding.gyp))
 
 # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
@@ -493,6 +493,9 @@ bench-url: all
 bench-events: all
 	@$(NODE) benchmark/common.js events
 
+bench-util: all
+	@$(NODE) benchmark/common.js util
+
 bench-all: bench bench-misc bench-array bench-buffer bench-url bench-events
 
 bench: bench-net bench-http bench-fs bench-tls
@@ -507,7 +510,7 @@ bench-idle:
 
 jslint:
 	$(NODE) tools/eslint/bin/eslint.js src lib test tools/eslint-rules \
-		--rulesdir tools/eslint-rules --reset --quiet
+		--rulesdir tools/eslint-rules --quiet
 
 CPPLINT_EXCLUDE ?=
 CPPLINT_EXCLUDE += src/node_lttng.cc
@@ -517,7 +520,7 @@ CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc
 CPPLINT_EXCLUDE += src/queue.h
 CPPLINT_EXCLUDE += src/tree.h
 CPPLINT_EXCLUDE += src/v8abbr.h
-CPPLINT_EXCLUDE += $(wildcard test/addons/doc-*/*.cc test/addons/doc-*/*.h)
+CPPLINT_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
 
 CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \
 	deps/debugger-agent/include/* \

README.md

@@ -27,10 +27,14 @@ Prerequisites:
 * [Visual
 Studio](https://www.visualstudio.com/en-us/downloads/download-visual-studio
   -vs.aspx)
+* **Myles Borins** <myles.borins@gmail.com> `C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8`
+* **Evan Lucas** <evanlucas@me.com> `B9AE9905FFD7803F25714661B63B535A4C206CA9`
 
 ```sh
 vcbuild chakracore nosign [x86|x64|arm]
 ```
+gpg --keyserver pool.sks-keyservers.net --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8
+gpg --keyserver pool.sks-keyservers.net --recv-keys B9AE9905FFD7803F25714661B63B535A4C206CA9
 
 ### Original README
 

WORKING_GROUPS.md

@@ -37,7 +37,7 @@ back in to the TSC.
 * [Starting a Working Group](#starting-a-wg)
 * [Bootstrap Governance](#bootstrap-governance)
 
-### [Website](https://github.com/nodejs/website)
+### [Website](https://github.com/nodejs/nodejs.org)
 
 The website working group's purpose is to build and maintain a public
 website for the `Node.js` project.

benchmark/util/inspect.js

@@ -0,0 +1,15 @@
+var util = require('util');
+
+var common = require('../common.js');
+
+var bench = common.createBenchmark(main, {n: [5e6]});
+
+function main(conf) {
+  var n = conf.n | 0;
+
+  bench.start();
+  for (var i = 0; i < n; i += 1) {
+    var r = util.inspect({a: 'a', b: 'b', c: 'c', d: 'd'});
+  }
+  bench.end(n);
+}

configure

@@ -95,9 +95,9 @@ parser.add_option("--partly-static",
 parser.add_option("--enable-vtune-profiling",
     action="store_true",
     dest="enable_vtune_profiling",
-    help="Enable profiling support for Intel Vtune profiler to profile"
+    help="Enable profiling support for Intel VTune profiler to profile"
          "JavaScript code executed in nodejs. This feature is only available "
-         "for ia32, x32 or x64 platform.")
+         "for x32, x86 and x64 architectures.")
 
 
 parser.add_option("--link-module",
@@ -703,8 +703,8 @@ def configure_node(o):
     o['variables']['node_enable_v8_vtunejit'] = b(options.enable_vtune_profiling)
   elif options.enable_vtune_profiling:
     raise Exception(
-       'vtune profiler for JavaScript is only supported on x86, x32 or x64 '
-       'platform.')
+       'The VTune profiler for JavaScript is only supported on x32, x86 and x64 '
+       'architectures.')
   else:
     o['variables']['node_enable_v8_vtunejit'] = 'false'
 

doc/api/assert.markdown

@@ -2,10 +2,11 @@
 
     Stability: 3 - Locked
 
-The `assert` module provides a simple set of assertion tests that can be used
-to test invariants and implement unit tests. While the `assert` module is
-generally intended for internal use by Node.js itself, it can be used by user
-code calling `require('assert')`.
+The `assert` module provides a simple set of assertion tests that can be used to 
+test invariants. The module is intended for internal use by Node.js, but can be 
+used in application code via `require('assert')`. However, `assert` is not a 
+testing framework, and is not intended to be used as a general purpose assertion 
+library.
 
 The API for the `assert` module is [Locked][]. This means that there will be no
 additions or changes to any of the methods implemented and exposed by

doc/api/buffer.markdown

@@ -32,7 +32,7 @@ would need to ever use `require('buffer')`.
     const buf4 = new Buffer('tést', 'utf8');
       // creates a buffer containing UTF8 bytes [74, c3, a9, 73, 74]
 
-### Buffers and Character Encodings
+## Buffers and Character Encodings
 
 Buffers are commonly used to represent sequences of encoded characters
 such as UTF8, UCS2, Base64 or even Hex-encoded data. It is possible to
@@ -66,7 +66,7 @@ The character encodings currently supported by Node.js include:
 
 * `'hex'` - Encode each byte as two hexadecimal characters.
 
-### Buffers and TypedArray
+## Buffers and TypedArray
 
 Buffers are also `Uint8Array` TypedArray instances. However, there are subtle
 incompatibilities with the TypedArray specification in ECMAScript 2015. For
@@ -116,7 +116,7 @@ create a Buffer that uses only a part of the `ArrayBuffer`, use the
     console.log(buf.length);
       // Prints: 16
 
-### Buffers and ES6 iteration
+## Buffers and ES6 iteration
 
 Buffers can be iterated over using the ECMAScript 2015 (ES6) `for..of` syntax: