Skip to content

util: fix isBuffer #1988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brendanashworth wants to merge 3 commits into from
Closed

util: fix isBuffer #1988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03a6fd4
util: move deprecate() to internal module
brendanashworth Jun 16, 2015
c6c706f
buffer: fix cyclic dependency with util
brendanashworth Jun 16, 2015
5905ab2
util: dont repeat isBuffer
brendanashworth Jun 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
buffer: fix cyclic dependency with util
  • Loading branch information
@brendanashworth
brendanashworth committed Jun 16, 2015
commit c6c706fa80f887be57327d88dc2caa03f1e4a876
5 changes: 2 additions & 3 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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');
Expand All @@ -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');
Expand Down
4 changes: 4 additions & 0 deletions test/parallel/test-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down