util: introduce `printDeprecationMessage` function

`printDeprecationMessage` is used to deprecate modules
and execution branches.

PR-URL: https://github.com/nodejs/io.js/pull/1822
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
pull/1822/merge
Vladimir Kurchatkin 2015-05-28 17:01:56 +03:00
parent 6537fd4b55
commit 628845b816
5 changed files with 26 additions and 26 deletions

View File

@ -3,6 +3,7 @@
const binding = process.binding('buffer');
const smalloc = process.binding('smalloc');
const util = require('util');
const internalUtil = require('internal/util');
const alloc = smalloc.alloc;
const truncate = smalloc.truncate;
const sliceOnto = smalloc.sliceOnto;
@ -504,16 +505,7 @@ Buffer.prototype.write = function(string, offset, length, encoding) {
// XXX legacy write(string, encoding, offset, length) - remove in v0.13
} else {
if (!writeWarned) {
if (process.throwDeprecation)
throw new Error(writeMsg);
else if (process.traceDeprecation)
console.trace(writeMsg);
else
console.error(writeMsg);
writeWarned = true;
}
writeWarned = internalUtil.printDeprecationMessage(writeMsg, writeWarned);
var swap = encoding;
encoding = offset;
offset = length >>> 0;

View File

@ -0,0 +1,18 @@
'use strict';
exports.printDeprecationMessage = function(msg, warned) {
if (process.noDeprecation)
return true;
if (warned)
return warned;
if (process.throwDeprecation)
throw new Error(msg);
else if (process.traceDeprecation)
console.trace(msg);
else
console.error(msg);
return true;
};

View File

@ -1,13 +1,10 @@
'use strict';
const util = require('util');
const util = require('internal/util');
// the sys module was renamed to 'util'.
// this shim remains to keep old programs working.
// sys is deprecated and shouldn't be used
const setExports = util.deprecate(function() {
module.exports = util;
}, 'sys is deprecated. Use util instead.');
setExports();
module.exports = require('util');
util.printDeprecationMessage('sys is deprecated. Use util instead.');

View File

@ -2,6 +2,7 @@
const uv = process.binding('uv');
const Debug = require('vm').runInDebugContext('Debug');
const internalUtil = require('internal/util');
const formatRegExp = /%[sdj%]/g;
exports.format = function(f) {
@ -63,16 +64,7 @@ exports.deprecate = function(fn, msg) {
var warned = false;
function deprecated() {
if (!warned) {
if (process.throwDeprecation) {
throw new Error(msg);
} else if (process.traceDeprecation) {
console.trace(msg);
} else {
console.error(msg);
}
warned = true;
}
warned = internalUtil.printDeprecationMessage(msg, warned);
return fn.apply(this, arguments);
}

View File

@ -75,6 +75,7 @@
'lib/internal/smalloc.js',
'lib/internal/socket_list.js',
'lib/internal/repl.js',
'lib/internal/util.js',
],
},