From 352a9c37374dd4f70f52d5ccd226889bb2b442bb Mon Sep 17 00:00:00 2001
From: Suryanarayana Murthy N <snarkedi@in.ibm.com>
Date: Fri, 10 Nov 2017 18:17:17 +0530
Subject: [PATCH 1/3] lib: Replacing the string concatenation with string
 template

---
 lib/fs.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index e1407ba4f1ed9b..d6b6d6656d8e88 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -115,8 +115,8 @@ function rethrow() {
     var backtrace = new Error();
     return function(err) {
       if (err) {
-        backtrace.stack = err.name + ': ' + err.message +
-                          backtrace.stack.substr(backtrace.name.length);
+        backtrace.stack = `${err.name}: ${err.message}` +
+                          `${backtrace.stack.substr(${backtrace.name.length})}`;
         throw backtrace;
       }
     };
@@ -1874,7 +1874,7 @@ fs.mkdtemp = function(prefix, options, callback) {
   var req = new FSReqWrap();
   req.oncomplete = callback;
 
-  binding.mkdtemp(prefix + 'XXXXXX', options.encoding, req);
+  binding.mkdtemp(`${prefix}XXXXXX`, options.encoding, req);
 };
 
 
@@ -1887,7 +1887,7 @@ fs.mkdtempSync = function(prefix, options) {
   }
   options = getOptions(options, {});
   nullCheck(prefix);
-  return binding.mkdtemp(prefix + 'XXXXXX', options.encoding);
+  return binding.mkdtemp(`${prefix}XXXXXX`, options.encoding);
 };
 
 

From 577c39af71ab7cd64075bd8bad71c65f3d4bd993 Mon Sep 17 00:00:00 2001
From: Suryanarayana Murthy N <snarkedi@in.ibm.com>
Date: Fri, 10 Nov 2017 18:42:02 +0530
Subject: [PATCH 2/3] lib: Fixed the number of charecters

---
 lib/fs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fs.js b/lib/fs.js
index d6b6d6656d8e88..fe5db45a65b7ae 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -116,7 +116,7 @@ function rethrow() {
     return function(err) {
       if (err) {
         backtrace.stack = `${err.name}: ${err.message}` +
-                          `${backtrace.stack.substr(${backtrace.name.length})}`;
+                        `${backtrace.stack.substr(`${backtrace.name.length}`)}`;
         throw backtrace;
       }
     };

From a52750fd8b8af6f6a5f269038bab685e6ae6d0a0 Mon Sep 17 00:00:00 2001
From: Suryanarayana Murthy N <snarkedi@in.ibm.com>
Date: Mon, 13 Nov 2017 11:40:57 +0530
Subject: [PATCH 3/3] lib: Changing based on the review comments received for
 PR#16933

---
 lib/fs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fs.js b/lib/fs.js
index fe5db45a65b7ae..784b8b30e90f06 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -116,7 +116,7 @@ function rethrow() {
     return function(err) {
       if (err) {
         backtrace.stack = `${err.name}: ${err.message}` +
-                        `${backtrace.stack.substr(`${backtrace.name.length}`)}`;
+                          backtrace.stack.substr(backtrace.name.length);
         throw backtrace;
       }
     };