dns: use template literals

benjamingr · benjamingr · commit 8baaa25aec5a · 2016-03-22T11:30:57.000+02:00
Prefer the use of template string literals over string concatenation in the dns module, makes dns consistent with other modules basically doing #5778 for it. PR-URL: #5809 Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/dns.js b/lib/dns.js
@@ -24,7 +24,8 @@ function errnoException(err, syscall, hostname) {
 }
 var ex = null;
 if (typeof err === 'string') { // c-ares error code.
- ex = new Error(syscall + ' ' + err + (hostname ? ' ' + hostname : ''));
+ const errHost = hostname ? ' ' + hostname : '';
+ ex = new Error(`${syscall} ${err}${errHost}`);
 ex.code = err;
 ex.errno = err;
 ex.syscall = syscall;
@@ -271,7 +272,7 @@ exports.resolve = function(hostname, type_, callback_) {
 if (typeof resolver === 'function') {
 return resolver(hostname, callback);
 } else {
- throw new Error('Unknown type "' + type_ + '"');
+ throw new Error(`Unknown type "${type_}"`);
 }
 };
 
@@ -309,7 +310,7 @@ exports.setServers = function(servers) {
 if (ver)
 return newSet.push([ver, s]);
 
- throw new Error('IP address is not properly formatted: ' + serv);
+ throw new Error(`IP address is not properly formatted: ${serv}`);
 });
 
 var r = cares.setServers(newSet);
@@ -319,8 +320,7 @@ exports.setServers = function(servers) {
 cares.setServers(orig.join(','));
 
 var err = cares.strerror(r);
- throw new Error('c-ares failed to set servers: "' + err +
- '" [' + servers + ']');
+ throw new Error(`c-ares failed to set servers: "${err}" [${servers}]`);
 }
 };
 

-Original file line number
+Diff line change
+}
 varex=null;
 if(typeoferr==='string'){// c-ares error code.
 -ex=newError(syscall+' '+err+(hostname ? ' '+hostname : ''));
 +consterrHost=hostname ? ' '+hostname : '';
 +ex=newError(`${syscall}${err}${errHost}`);
 ex.code=err;
 ex.errno=err;
 ex.syscall=syscall;
 if(typeofresolver==='function'){
 returnresolver(hostname,callback);
 }else{
 -thrownewError('Unknown type "'+type_+'"');
 +thrownewError(`Unknown type "${type_}"`);
+}
 };
 if(ver)
 returnnewSet.push([ver,s]);
 -thrownewError('IP address is not properly formatted: '+serv);
 +thrownewError(`IP address is not properly formatted: ${serv}`);
 });
 varr=cares.setServers(newSet);
 cares.setServers(orig.join(','));
 varerr=cares.strerror(r);
 -thrownewError('c-ares failed to set servers: "'+err+
 -'" ['+servers+']');
 +thrownewError(`c-ares failed to set servers: "${err}" [${servers}]`);
+}
 };