timers: refactor to use optional chaining

nodejs · Jan 8, 2021 · 738759a · 738759a
1 parent 15e47ed
commit 738759a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/lib/timers.js b/lib/timers.js
@@ -171,7 +171,7 @@ ObjectDefineProperty(setTimeout, customPromisify, {
 });
 
 function clearTimeout(timer) {
-  if (timer && timer._onTimeout) {
+  if (timer?._onTimeout) {
     timer._onTimeout = null;
     unenroll(timer);
     return;

diff --git a/lib/timers/promises.js b/lib/timers/promises.js
@@ -49,10 +49,7 @@ function setTimeout(after, value, options = {}) {
         'boolean',
         ref));
   }
-  // TODO(@jasnell): If a decision is made that this cannot be backported
-  // to 12.x, then this can be converted to use optional chaining to
-  // simplify the check.
-  if (signal && signal.aborted) {
+  if (signal?.aborted) {
     return PromiseReject(new AbortError());
   }
   let oncancel;
@@ -94,10 +91,7 @@ function setImmediate(value, options = {}) {
         'boolean',
         ref));
   }
-  // TODO(@jasnell): If a decision is made that this cannot be backported
-  // to 12.x, then this can be converted to use optional chaining to
-  // simplify the check.
-  if (signal && signal.aborted) {
+  if (signal?.aborted) {
     return PromiseReject(new AbortError());
   }
   let oncancel;