tools: enable no-useless-return eslint rule

cjihrig · evanlucas · commit 258eeaa5193b · 2017-05-02T12:46:18.000-05:00
PR-URL: #12577 Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: Roman Reiss <me@silverwind.io> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -46,6 +46,7 @@ rules:
   no-unused-labels: 2
   no-useless-call: 2
   no-useless-escape: 2
+  no-useless-return: 2
   no-void: 2
   no-with: 2
 
diff --git a/doc/api/errors.md b/doc/api/errors.md
@@ -64,6 +64,7 @@ Errors that occur within _Asynchronous APIs_ may be reported in multiple ways:
   argument is not `null` and is an instance of `Error`, then an error occurred
   that should be handled.
 
+<!-- eslint-disable no-useless-return -->
   ```js
   const fs = require('fs');
   fs.readFile('a file that does not exist', (err, data) => {
diff --git a/doc/api/stream.md b/doc/api/stream.md
@@ -1566,6 +1566,7 @@ unexpected and inconsistent behavior depending on whether the stream is
 operating in flowing or paused mode. Using the `'error'` event ensures
 consistent and predictable handling of errors.
 
+<!-- eslint-disable no-useless-return -->
 ```js
 const Readable = require('stream').Readable;
 
diff --git a/lib/dgram.js b/lib/dgram.js
@@ -282,7 +282,6 @@ function enqueue(self, toEnqueue) {
     self.once('listening', clearQueue);
   }
   self._queue.push(toEnqueue);
-  return;
 }
 
 
diff --git a/test/parallel/test-require-symlink.js b/test/parallel/test-require-symlink.js
@@ -30,9 +30,9 @@ if (common.isWindows) {
     if (err || !o.includes('SeCreateSymbolicLinkPrivilege')) {
       common.skip('insufficient privileges');
       return;
-    } else {
-      test();
     }
+
+    test();
   });
 } else {
   test();
diff --git a/tools/doc/json.js b/tools/doc/json.js
@@ -222,7 +222,6 @@ function processList(section) {
         current.options.push(n);
         current = n;
       }
-      return;
     } else if (type === 'list_item_end') {
       if (!current) {
         throw new Error('invalid list - end without current item\n' +
@@ -495,9 +494,6 @@ function finishSection(section, parent) {
             parent[k] = parent[k].concat(section[k]);
           } else if (!parent[k]) {
             parent[k] = section[k];
-          } else {
-            // parent already has, and it's not an array.
-            return;
           }
       }
     });

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,6 @@ function enqueue(self, toEnqueue) {`
`282`	`282`	`self.once('listening', clearQueue);`
`283`	`283`	`}`
`284`	`284`	`self._queue.push(toEnqueue);`
`285`		`- return;`
`286`	`285`	`}`
`287`	`286`
`288`	`287`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,6 @@ function processList(section) {`
`222`	`222`	`current.options.push(n);`
`223`	`223`	`current = n;`
`224`	`224`	`}`
`225`		`- return;`
`226`	`225`	`} else if (type === 'list_item_end') {`
`227`	`226`	`if (!current) {`
`228`	`227`	`throw new Error('invalid list - end without current item\n' +`
`@@ -495,9 +494,6 @@ function finishSection(section, parent) {`
`495`	`494`	`parent[k] = parent[k].concat(section[k]);`
`496`	`495`	`} else if (!parent[k]) {`
`497`	`496`	`parent[k] = section[k];`
`498`		`- } else {`
`499`		`- // parent already has, and it's not an array.`
`500`		`- return;`
`501`	`497`	`}`
`502`	`498`	`}`
`503`	`499`	`});`