[v9.x backport] This is backporting multiple commits that were requested

.eslintrc.yaml

@@ -137,8 +137,11 @@ rules:
   no-mixed-spaces-and-tabs: error
   no-multiple-empty-lines: [error, {max: 2, maxEOF: 0, maxBOF: 0}]
   no-restricted-syntax: [error, {
+    selector: "CallExpression[callee.object.name='assert'][callee.property.name='doesNotThrow']",
+    message: "Please replace `assert.doesNotThrow()` and add a comment next to the code instead."
+  }, {
     selector: "CallExpression[callee.object.name='assert'][callee.property.name='throws'][arguments.1.type='Literal']:not([arguments.1.regex])",
-    message: "use a regular expression for second argument of assert.throws()"
+    message: "Use a regular expression for second argument of assert.throws()"
   }, {
     selector: "CallExpression[callee.object.name='assert'][callee.property.name='throws'][arguments.length<2]",
     message: "assert.throws() must be invoked with at least two arguments."
@@ -154,6 +157,7 @@ rules:
   }]
   no-tabs: error
   no-trailing-spaces: error
+  no-unsafe-finally: error
   object-curly-spacing: [error, always]
   one-var-declaration-per-line: error
   operator-linebreak: [error, after]

benchmark/assert/throws.js

@@ -26,6 +26,7 @@ function main({ n, method }) {
     case 'doesNotThrow':
       bench.start();
       for (i = 0; i < n; ++i) {
+        // eslint-disable-next-line no-restricted-syntax
         assert.doesNotThrow(doesNotThrow);
       }
       bench.end(n);

benchmark/http/_chunky_http_client.js

@@ -5,8 +5,8 @@ const common = require('../common.js');
 const net = require('net');
 
 const bench = common.createBenchmark(main, {
-  len:  [1, 4, 8, 16, 32, 64, 128],
-  n:  [5, 50, 500, 2000],
+  len: [1, 4, 8, 16, 32, 64, 128],
+  n: [5, 50, 500, 2000],
   type: ['send'],
 });
 

benchmark/tls/tls-connect.js

@@ -1,7 +1,7 @@
 'use strict';
-var fs = require('fs'),
-  path = require('path'),
-  tls = require('tls');
+const fs = require('fs');
+const path = require('path');
+const tls = require('tls');
 
 const common = require('../common.js');
 const bench = common.createBenchmark(main, {

doc/.eslintrc.yaml

@@ -12,6 +12,7 @@ rules:
   no-var: error
   prefer-const: error
   prefer-rest-params: error
+  prefer-template: error
 
   # Stylistic Issues
   no-multiple-empty-lines: [error, {max: 1, maxEOF: 0, maxBOF: 0}]

doc/api/assert.md

@@ -346,6 +346,7 @@ to the caller.
 The following, for instance, will throw the [`TypeError`][] because there is no
 matching error type in the assertion:
 
+<!-- eslint-disable no-restricted-syntax -->
 ```js
 assert.doesNotThrow(
   () => {
@@ -358,6 +359,7 @@ assert.doesNotThrow(
 However, the following will result in an `AssertionError` with the message
 'Got unwanted exception (TypeError)..':
 
+<!-- eslint-disable no-restricted-syntax -->
 ```js
 assert.doesNotThrow(
   () => {
@@ -371,6 +373,7 @@ If an `AssertionError` is thrown and a value is provided for the `message`
 parameter, the value of `message` will be appended to the `AssertionError`
 message:
 
+<!-- eslint-disable no-restricted-syntax -->
 ```js
 assert.doesNotThrow(
   () => {