Commit 340b770
committed
stream: unify writableErrored and readableErrored
Both of these should always refer to the same error, hence
there is no reason to separate them.
PR-URL: #40799
Refs: #40696
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 2b0087f commit 340b770
5 files changed
Lines changed: 8 additions & 8 deletions
File tree
- doc/api
- lib/internal/streams
- test/parallel
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -633,7 +633,7 @@ added: | |||
| 633 | 633 | Number of times [`writable.uncork()`][stream-uncork] needs to be | |
| 634 | 634 | called in order to fully uncork the stream. | |
| 635 | 635 | ||
| 636 | - ##### `writable.writableErrored` | ||
| 636 | + ##### `writable.errored` | ||
| 637 | 637 | ||
| 638 | 638 | <!-- YAML | |
| 639 | 639 | added: | |
@@ -1389,7 +1389,7 @@ added: v12.9.0 | |||
| 1389 | 1389 | ||
| 1390 | 1390 | Becomes `true` when [`'end'`][] event is emitted. | |
| 1391 | 1391 | ||
| 1392 | - ##### `readable.readableErrored` | ||
| 1392 | + ##### `readable.errored` | ||
| 1393 | 1393 | ||
| 1394 | 1394 | <!-- YAML | |
| 1395 | 1395 | added: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1242,7 +1242,7 @@ ObjectDefineProperties(Readable.prototype, { | |||
| 1242 | 1242 | } | |
| 1243 | 1243 | }, | |
| 1244 | 1244 | ||
| 1245 | - readableErrored: { | ||
| 1245 | + errored: { | ||
| 1246 | 1246 | enumerable: false, | |
| 1247 | 1247 | get() { | |
| 1248 | 1248 | return this._readableState ? this._readableState.errored : null; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -858,7 +858,7 @@ ObjectDefineProperties(Writable.prototype, { | |||
| 858 | 858 | } | |
| 859 | 859 | }, | |
| 860 | 860 | ||
| 861 | - writableErrored: { | ||
| 861 | + errored: { | ||
| 862 | 862 | enumerable: false, | |
| 863 | 863 | get() { | |
| 864 | 864 | return this._writableState ? this._writableState.errored : null; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -612,7 +612,7 @@ testClosed((opts) => new Writable({ write() {}, ...opts })); | |||
| 612 | 612 | const w = new Writable(); | |
| 613 | 613 | const _err = new Error(); | |
| 614 | 614 | w.destroy(_err); | |
| 615 | - assert.strictEqual(w.writableErrored, _err); | ||
| 615 | + assert.strictEqual(w.errored, _err); | ||
| 616 | 616 | finished(w, common.mustCall((err) => { | |
| 617 | 617 | assert.strictEqual(_err, err); | |
| 618 | 618 | assert.strictEqual(w.closed, true); | |
@@ -625,7 +625,7 @@ testClosed((opts) => new Writable({ write() {}, ...opts })); | |||
| 625 | 625 | { | |
| 626 | 626 | const w = new Writable(); | |
| 627 | 627 | w.destroy(); | |
| 628 | - assert.strictEqual(w.writableErrored, null); | ||
| 628 | + assert.strictEqual(w.errored, null); | ||
| 629 | 629 | finished(w, common.mustCall((err) => { | |
| 630 | 630 | assert.strictEqual(w.closed, true); | |
| 631 | 631 | assert.strictEqual(err.code, 'ERR_STREAM_PREMATURE_CLOSE'); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,7 +13,7 @@ const assert = require('assert'); | |||
| 13 | 13 | read.on('close', common.mustCall()); | |
| 14 | 14 | ||
| 15 | 15 | read.destroy(); | |
| 16 | - assert.strictEqual(read.readableErrored, null); | ||
| 16 | + assert.strictEqual(read.errored, null); | ||
| 17 | 17 | assert.strictEqual(read.destroyed, true); | |
| 18 | 18 | } | |
| 19 | 19 | ||
@@ -32,7 +32,7 @@ const assert = require('assert'); | |||
| 32 | 32 | })); | |
| 33 | 33 | ||
| 34 | 34 | read.destroy(expected); | |
| 35 | - assert.strictEqual(read.readableErrored, expected); | ||
| 35 | + assert.strictEqual(read.errored, expected); | ||
| 36 | 36 | assert.strictEqual(read.destroyed, true); | |
| 37 | 37 | } | |
| 38 | 38 | ||
0 commit comments