cjihrig's comments

refack · refack · commit 0e54f72aadd9 · 2017-06-10T15:47:33.000-04:00
diff --git a/doc/api/util.md b/doc/api/util.md
@@ -18,12 +18,10 @@ added: REPLACEME
 * `original` {Function} An `async` function
 * Returns: {Function} a callback style function
 
-This method converts Promise returning API endpoints to ones that use callbacks.
-`callbackify` takes an `async` function (or a function that returns a Promise)
-and returns a function following the common Node.js callback style, i.e. taking
-a `(err, val) => ...` callback as the last argument. In the callback, the first
-argument will be the rejection reason (or `null` if the Promise resolved), and
-the second argument will be the resolved value.
+Takes an `async` function (or a function that returns a Promise) and returns a
+function following the Node.js error first callback style. In the callback, the
+first argument will be the rejection reason (or `null` if the Promise resolved),
+and the second argument will be the resolved value.
 
 For example:
 
@@ -41,18 +39,17 @@ callbackFunction((err, ret) => {
 });
 ```
 
-Will print something like:
+Will print:
 
 ```txt
 hello world
 ```
 
 *Note*:
 
-* Like with most callback style functions, the callback is executed in an
-async context (i.e. having a limited stacktrace). If the callback throws, the
-process will emit an [`'uncaughtException'`][] event, and if not handled will
-exit.
+* The callback is executed asynchronously, and will have a limited stack trace.
+If the callback throws, the process will emit an [`'uncaughtException'`][]
+event, and if not handled will exit.
 
 * Since `null` has a special meaning as the first argument to a callback, if a
 wrapped function rejects a `Promise` with a falsy value as a reason, the value
diff --git a/test/fixtures/uncaught-exceptions/callbackify1.js b/test/fixtures/uncaught-exceptions/callbackify1.js
@@ -5,9 +5,9 @@
 const { callbackify } = require('util');
 
 {
-  async function fn3() { }
+  async function fn() { }
 
-  const cbFn = callbackify(fn3);
+  const cbFn = callbackify(fn);
 
   cbFn((err, ret) => {
     throw new Error(__filename);
diff --git a/test/fixtures/uncaught-exceptions/callbackify2.js b/test/fixtures/uncaught-exceptions/callbackify2.js
@@ -13,10 +13,10 @@ const { callbackify } = require('util');
     console.log(err.message);
   });
 
-  async function fn3() {
+  async function fn() {
     return await Promise.reject(sentinel);
   }
 
-  const cbFn = callbackify(fn3);
+  const cbFn = callbackify(fn);
   cbFn((err, ret) => assert.ifError(err));
 }

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`const { callbackify } = require('util');`
`6`	`6`
`7`	`7`	`{`
`8`		`- async function fn3() { }`
	`8`	`+ async function fn() { }`
`9`	`9`
`10`		`- const cbFn = callbackify(fn3);`
	`10`	`+ const cbFn = callbackify(fn);`
`11`	`11`
`12`	`12`	`cbFn((err, ret) => {`
`13`	`13`	`throw new Error(__filename);`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ const { callbackify } = require('util');`
`13`	`13`	`console.log(err.message);`
`14`	`14`	`});`
`15`	`15`
`16`		`- async function fn3() {`
	`16`	`+ async function fn() {`
`17`	`17`	`return await Promise.reject(sentinel);`
`18`	`18`	`}`
`19`	`19`
`20`		`- const cbFn = callbackify(fn3);`
	`20`	`+ const cbFn = callbackify(fn);`
`21`	`21`	`cbFn((err, ret) => assert.ifError(err));`
`22`	`22`	`}`