Update scala to 2.13.3 and silencer to 1.7.0 (#28991)

* Update scala to 2.13.3 and silencer to 1.7.0
* Also travis
* Fix various warnings
This commit is contained in:
Arnout Engelen 2020-08-10 12:54:38 +02:00 committed by GitHub
parent f7bfed02bc
commit c41c0420ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
113 changed files with 180 additions and 206 deletions

View file

@ -415,9 +415,9 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
throw new IllegalStateException("Restarting not supported for connection actors.")
def PendingWrite(commander: ActorRef, write: WriteCommand): PendingWrite = {
@tailrec def create(head: WriteCommand, tail: WriteCommand = Write.empty): PendingWrite =
@tailrec def create(head: WriteCommand, tail: WriteCommand): PendingWrite =
head match {
case Write.empty => if (tail eq Write.empty) EmptyPendingWrite else create(tail)
case Write.empty => if (tail eq Write.empty) EmptyPendingWrite else create(tail, Write.empty)
case Write(data, ack) if data.nonEmpty => PendingBufferWrite(commander, data, ack, tail)
case WriteFile(path, offset, count, ack) =>
PendingWriteFile(commander, Paths.get(path), offset, count, ack, tail)
@ -426,9 +426,9 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
case CompoundWrite(h, t) => create(h, t)
case x @ Write(_, ack) => // empty write with either an ACK or a non-standard NoACK
if (x.wantsAck) commander ! ack
create(tail)
create(tail, Write.empty)
}
create(write)
create(write, Write.empty)
}
def PendingBufferWrite(commander: ActorRef, data: ByteString, ack: Event, tail: WriteCommand): PendingBufferWrite = {