doc,test: remove unnecessary await with return instances

Trott · MylesBorins · commit a25648231890 · 2017-12-12T03:28:00.000-05:00
Remove unnecessary `await` in combination with `return` in preparation for enabling lint rule. PR-URL: #17265 Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
diff --git a/doc/api/util.md b/doc/api/util.md
@@ -31,7 +31,7 @@ For example:
 const util = require('util');
 
 async function fn(){
- return await Promise.resolve('hello world');
+ return 'hello world';
 }
 const callbackFunction = util.callbackify(fn);
 
diff --git a/test/common/inspector-helper.js b/test/common/inspector-helper.js
@@ -390,7 +390,7 @@ class NodeInstance{
 console.log('[test]', 'Connecting to a child Node process');
 const response = await this.httpGet(null, '/json/list');
 const url = response[0]['webSocketDebuggerUrl'];
- return await this.wsHandshake(url);
+ return this.wsHandshake(url);
 }
 
 expectShutdown(){
diff --git a/test/parallel/test-util-callbackify.js b/test/parallel/test-util-callbackify.js
@@ -28,7 +28,7 @@ const values = [
 for (const value of values){
 // Test and `async function`
 async function asyncFn(){
- return await Promise.resolve(value);
+ return value;
 }
 
 const cbAsyncFn = callbackify(asyncFn);
@@ -70,7 +70,7 @@ const values = [
 for (const value of values){
 // Test an `async function`
 async function asyncFn(){
- return await Promise.reject(value);
+ return Promise.reject(value);
 }
 
 const cbAsyncFn = callbackify(asyncFn);
@@ -142,7 +142,7 @@ const values = [
 for (const value of values){
 async function asyncFn(arg){
 assert.strictEqual(arg, value);
- return await Promise.resolve(arg);
+ return arg;
 }
 
 const cbAsyncFn = callbackify(asyncFn);
@@ -183,7 +183,7 @@ const values = [
 const iAmThat ={
 async fn(arg){
 assert.strictEqual(this, iAmThat);
- return await Promise.resolve(arg);
+ return arg;
 },
 };
 iAmThat.cbFn = callbackify(iAmThat.fn);
@@ -241,7 +241,7 @@ const values = [
 
{
 async function asyncFn(){
- return await Promise.resolve(42);
+ return 42;
 }
 
 const cb = callbackify(asyncFn);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ For example:`
`31`	`31`	`constutil=require('util');`
`32`	`32`
`33`	`33`	`asyncfunctionfn(){`
`34`		`-returnawaitPromise.resolve('hello world');`
	`34`	`+return'hello world';`
`35`	`35`	`}`
`36`	`36`	`constcallbackFunction=util.callbackify(fn);`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ class NodeInstance{`
`390`	`390`	`console.log('[test]','Connecting to a child Node process');`
`391`	`391`	`constresponse=awaitthis.httpGet(null,'/json/list');`
`392`	`392`	`consturl=response[0]['webSocketDebuggerUrl'];`
`393`		`-returnawaitthis.wsHandshake(url);`
	`393`	`+returnthis.wsHandshake(url);`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`expectShutdown(){`
-Original file line number
+Diff line change
 for(constvalueofvalues){
 // Test and `async function`
 asyncfunctionasyncFn(){
 -returnawaitPromise.resolve(value);
 +returnvalue;
+}
 constcbAsyncFn=callbackify(asyncFn);
 for(constvalueofvalues){
 // Test an `async function`
 asyncfunctionasyncFn(){
 -returnawaitPromise.reject(value);
 +returnPromise.reject(value);
+}
 constcbAsyncFn=callbackify(asyncFn);
 for(constvalueofvalues){
 asyncfunctionasyncFn(arg){
 assert.strictEqual(arg,value);
 -returnawaitPromise.resolve(arg);
 +returnarg;
+}
 constcbAsyncFn=callbackify(asyncFn);
 constiAmThat={
 asyncfn(arg){
 assert.strictEqual(this,iAmThat);
 -returnawaitPromise.resolve(arg);
 +returnarg;
 },
 };
 iAmThat.cbFn=callbackify(iAmThat.fn);
+{
 asyncfunctionasyncFn(){
 -returnawaitPromise.resolve(42);
 +return42;
+}
 constcb=callbackify(asyncFn);