diff --git a/lib/buffer.js b/lib/buffer.js index 81fe904a8b76c0..619b735fe7e74b 100644 --- a/lib/buffer.js +++ b/lib/buffer.js @@ -3,7 +3,6 @@ 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; @@ -457,7 +456,7 @@ Buffer.prototype.fill = function fill(val, start, end) { // XXX remove in v0.13 -Buffer.prototype.get = util.deprecate(function get(offset) { +Buffer.prototype.get = internalUtil.deprecate(function get(offset) { offset = ~~offset; if (offset < 0 || offset >= this.length) throw new RangeError('index out of range'); @@ -466,7 +465,7 @@ Buffer.prototype.get = util.deprecate(function get(offset) { // XXX remove in v0.13 -Buffer.prototype.set = util.deprecate(function set(offset, v) { +Buffer.prototype.set = internalUtil.deprecate(function set(offset, v) { offset = ~~offset; if (offset < 0 || offset >= this.length) throw new RangeError('index out of range'); diff --git a/lib/internal/util.js b/lib/internal/util.js index 76576331adbb99..8019260e0c7c35 100644 --- a/lib/internal/util.js +++ b/lib/internal/util.js @@ -16,3 +16,27 @@ exports.printDeprecationMessage = function(msg, warned) { return true; }; + +// Mark that a method should not be used. +// Returns a modified function which warns once by default. +// If --no-deprecation is set, then it is a no-op. +exports.deprecate = function(fn, msg) { + // Allow for deprecating things in the process of starting up. + if (global.process === undefined) { + return function() { + return exports.deprecate(fn, msg).apply(this, arguments); + }; + } + + if (process.noDeprecation === true) { + return fn; + } + + var warned = false; + function deprecated() { + warned = exports.printDeprecationMessage(msg, warned); + return fn.apply(this, arguments); + } + + return deprecated; +}; diff --git a/lib/util.js b/lib/util.js index 177cf454eeca91..50f1e1b53138b3 100644 --- a/lib/util.js +++ b/lib/util.js @@ -48,29 +48,7 @@ exports.format = function(f) { }; -// Mark that a method should not be used. -// Returns a modified function which warns once by default. -// If --no-deprecation is set, then it is a no-op. -exports.deprecate = function(fn, msg) { - // Allow for deprecating things in the process of starting up. - if (global.process === undefined) { - return function() { - return exports.deprecate(fn, msg).apply(this, arguments); - }; - } - - if (process.noDeprecation === true) { - return fn; - } - - var warned = false; - function deprecated() { - warned = internalUtil.printDeprecationMessage(msg, warned); - return fn.apply(this, arguments); - } - - return deprecated; -}; +exports.deprecate = internalUtil.deprecate; var debugs = {}; @@ -662,10 +640,7 @@ function isPrimitive(arg) { } exports.isPrimitive = isPrimitive; -function isBuffer(arg) { - return arg instanceof Buffer; -} -exports.isBuffer = isBuffer; +exports.isBuffer = Buffer.isBuffer; function objectToString(o) { return Object.prototype.toString.call(o); diff --git a/test/parallel/test-util.js b/test/parallel/test-util.js index 2795d3ecd68662..79e104546b7f37 100644 --- a/test/parallel/test-util.js +++ b/test/parallel/test-util.js @@ -71,6 +71,10 @@ assert.equal(true, util.isPrimitive(Infinity)); assert.equal(true, util.isPrimitive(NaN)); assert.equal(true, util.isPrimitive(Symbol('symbol'))); +// isBuffer +assert.equal(false, util.isBuffer('foo')); +assert.equal(true, util.isBuffer(new Buffer('foo'))); + // _extend assert.deepEqual(util._extend({a:1}), {a:1}); assert.deepEqual(util._extend({a:1}, []), {a:1});