Skip to content

Commit 3cff8ae

Browse files
committed
Merge commit 'b78e64300d2fcc997c1b07e7b873759dc20c29b5' into develop
* commit 'b78e64300d2fcc997c1b07e7b873759dc20c29b5': Miscellaneous fixes # Conflicts: # src/main/scala/io/scalajs/nodejs/stream/Readable.scala
2 parents 5b899c5 + b78e643 commit 3cff8ae

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/scala/io/scalajs/nodejs/Process.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ trait Process extends IEventEmitter {
7777
* Specifying a code to process.exit(code) will override any previous setting of process.exitCode.
7878
* @example process.exitCode
7979
*/
80-
def exitCode: Int = js.native
80+
var exitCode: Int = js.native
8181

8282
/**
8383
* TODO find documentation for this property

src/main/scala/io/scalajs/nodejs/stream/Readable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ object Readable {
190190
* flowing mode. Data will then be passed as soon as it is available.
191191
*/
192192
@inline
193-
def onData(listener: Buffer | String | Any => Any): readable.type = readable.on("data", listener)
193+
def onData[A](listener: A => Any): readable.type = readable.on("data", listener)
194194

195195
/**
196196
* This event fires when there will be no more data to read. Note that the 'end' event will not fire unless the

0 commit comments

Comments
 (0)