Skip to content

Commit ed54067

Browse files
committed
Fix scala.sys.process.ProcessBuilderImpl.{createProcess,toSource,toSink}
1 parent a0c8b82 commit ed54067

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

project/TastyMiMaFilters.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,10 @@ object TastyMiMaFilters {
119119
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.math.Big*.underlying"),
120120
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.immutable.TreeSet.sortedIterableFactory"),
121121
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.View.*PartitionMapped.iterator"),
122-
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.sys.process.ProcessBuilderImpl.*.toSink"),
123-
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.sys.process.ProcessBuilderImpl.*.toSource"),
124122
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.concurrent.duration.FiniteDuration.unary_-"),
125123
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.collection.convert.JavaCollectionWrappers.IteratorWrapper.remove"),
126124
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.collection.convert.JavaCollectionWrappers.IterableWrapperTrait.iterator"),
127125
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.util.matching.Regex.MatchIterator.replacementData"),
128-
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.sys.process.ProcessBuilderImpl.*.createProcess"),
129126

130127
// Problem: implicit class (method should not be final)
131128
ProblemMatcher.make(ProblemKind.FinalMember, "scala.collection.convert.*.*"),

stdlib-bootstrapped/src/scala/sys/process/ProcessBuilderImpl.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ private[process] trait ProcessBuilderImpl {
100100
}
101101

102102
private[scala] abstract class AbstractBuilder extends ProcessBuilder with Sink with Source {
103-
protected def toSource = this
104-
protected def toSink = this
103+
protected def toSource: AbstractBuilder = this
104+
protected def toSink: AbstractBuilder = this
105105

106106
private[this] val defaultStreamCapacity = 4096
107107

@@ -209,11 +209,11 @@ private[process] trait ProcessBuilderImpl {
209209
}
210210

211211
private[process] class URLImpl(url: URL) extends URLBuilder with Source {
212-
protected def toSource = new URLInput(url)
212+
protected def toSource: URLInput = new URLInput(url)
213213
}
214214
private[process] class FileImpl(base: File) extends FileBuilder with Sink with Source {
215-
protected def toSource = new FileInput(base)
216-
protected def toSink = new FileOutput(base, false)
215+
protected def toSource: FileInput = new FileInput(base)
216+
protected def toSink: FileOutput = new FileOutput(base, false)
217217

218218
def #<<(f: File): ProcessBuilder = #<<(new FileInput(f))
219219
def #<<(u: URL): ProcessBuilder = #<<(new URLInput(u))
@@ -248,27 +248,27 @@ private[process] trait ProcessBuilderImpl {
248248
toError: Boolean
249249
) extends SequentialBuilder(first, second, if (toError) "#|!" else "#|") {
250250

251-
override def createProcess(io: ProcessIO) = new PipedProcesses(first, second, io, toError)
251+
override def createProcess(io: ProcessIO): PipedProcesses = new PipedProcesses(first, second, io, toError)
252252
}
253253

254254
private[process] class AndBuilder(
255255
first: ProcessBuilder,
256256
second: ProcessBuilder
257257
) extends SequentialBuilder(first, second, "#&&") {
258-
override def createProcess(io: ProcessIO) = new AndProcess(first, second, io)
258+
override def createProcess(io: ProcessIO): AndProcess = new AndProcess(first, second, io)
259259
}
260260

261261
private[process] class OrBuilder(
262262
first: ProcessBuilder,
263263
second: ProcessBuilder
264264
) extends SequentialBuilder(first, second, "#||") {
265-
override def createProcess(io: ProcessIO) = new OrProcess(first, second, io)
265+
override def createProcess(io: ProcessIO): OrProcess = new OrProcess(first, second, io)
266266
}
267267

268268
private[process] class SequenceBuilder(
269269
first: ProcessBuilder,
270270
second: ProcessBuilder
271271
) extends SequentialBuilder(first, second, "###") {
272-
override def createProcess(io: ProcessIO) = new ProcessSequence(first, second, io)
272+
override def createProcess(io: ProcessIO): ProcessSequence = new ProcessSequence(first, second, io)
273273
}
274274
}

0 commit comments

Comments
 (0)