Update scalafmt-core to 2.1.0 (#27831)
* Update scalafmt-core to 2.1.0 * scalafmt
This commit is contained in:
parent
b10a83ad9b
commit
6b17a7a15f
11 changed files with 33 additions and 22 deletions
|
|
@ -1,4 +1,4 @@
|
|||
version = 2.0.1
|
||||
version = 2.1.0
|
||||
|
||||
style = defaultWithAlign
|
||||
|
||||
|
|
|
|||
|
|
@ -464,9 +464,9 @@ class TcpConnectionSpec extends AkkaSpec("""
|
|||
|
||||
val buffer = ByteBuffer.allocate(1)
|
||||
val thrown = the[IOException] thrownBy {
|
||||
windowsWorkaroundToDetectAbort()
|
||||
serverSideChannel.read(buffer)
|
||||
}
|
||||
windowsWorkaroundToDetectAbort()
|
||||
serverSideChannel.read(buffer)
|
||||
}
|
||||
thrown.getMessage should ===(ConnectionResetByPeerMessage)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,7 +157,6 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
|
|||
.mapConcat(identity) // Flatten the set of hashtags to a stream of hashtags
|
||||
.map(_.name.toUpperCase) // Convert all hashtags to upper case
|
||||
.runWith(Sink.foreach(println)) // Attach the Flow to a Sink that will finally print the hashtags
|
||||
|
||||
//#fiddle_code
|
||||
.value
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ private[persistence] trait LeveldbStore
|
|||
import com.github.ghik.silencer.silent
|
||||
@silent("deprecated")
|
||||
private val persistenceIdSubscribers = new mutable.HashMap[String, mutable.Set[ActorRef]]
|
||||
with mutable.MultiMap[String, ActorRef]
|
||||
with mutable.MultiMap[String, ActorRef]
|
||||
@silent("deprecated")
|
||||
private val tagSubscribers = new mutable.HashMap[String, mutable.Set[ActorRef]]
|
||||
with mutable.MultiMap[String, ActorRef]
|
||||
with mutable.MultiMap[String, ActorRef]
|
||||
private var allPersistenceIdsSubscribers = Set.empty[ActorRef]
|
||||
|
||||
private var tagSequenceNr = Map.empty[String, Long]
|
||||
|
|
|
|||
|
|
@ -118,12 +118,12 @@ private[akka] class RemoteWatcher(
|
|||
// actors that this node is watching, map of watchee -> Set(watchers)
|
||||
@silent("deprecated")
|
||||
val watching = new mutable.HashMap[InternalActorRef, mutable.Set[InternalActorRef]]()
|
||||
with mutable.MultiMap[InternalActorRef, InternalActorRef]
|
||||
with mutable.MultiMap[InternalActorRef, InternalActorRef]
|
||||
|
||||
// nodes that this node is watching, i.e. expecting heartbeats from these nodes. Map of address -> Set(watchee) on this address
|
||||
@silent("deprecated")
|
||||
val watcheeByNodes = new mutable.HashMap[Address, mutable.Set[InternalActorRef]]()
|
||||
with mutable.MultiMap[Address, InternalActorRef]
|
||||
with mutable.MultiMap[Address, InternalActorRef]
|
||||
def watchingNodes = watcheeByNodes.keySet
|
||||
|
||||
var unreachable: Set[Address] = Set.empty
|
||||
|
|
|
|||
|
|
@ -62,8 +62,11 @@ private[remote] class Encoder(
|
|||
|
||||
override def createLogicAndMaterializedValue(
|
||||
inheritedAttributes: Attributes): (GraphStageLogic, OutboundCompressionAccess) = {
|
||||
val logic = new GraphStageLogic(shape) with InHandler with OutHandler with StageLogging
|
||||
with OutboundCompressionAccess {
|
||||
val logic = new GraphStageLogic(shape)
|
||||
with InHandler
|
||||
with OutHandler
|
||||
with StageLogging
|
||||
with OutboundCompressionAccess {
|
||||
|
||||
private val headerBuilder = HeaderBuilder.out()
|
||||
headerBuilder.setVersion(version)
|
||||
|
|
@ -347,8 +350,11 @@ private[remote] class Decoder(
|
|||
val shape: FlowShape[EnvelopeBuffer, InboundEnvelope] = FlowShape(in, out)
|
||||
|
||||
def createLogicAndMaterializedValue(inheritedAttributes: Attributes): (GraphStageLogic, InboundCompressionAccess) = {
|
||||
val logic = new TimerGraphStageLogic(shape) with InboundCompressionAccessImpl with InHandler with OutHandler
|
||||
with StageLogging {
|
||||
val logic = new TimerGraphStageLogic(shape)
|
||||
with InboundCompressionAccessImpl
|
||||
with InHandler
|
||||
with OutHandler
|
||||
with StageLogging {
|
||||
import Decoder.RetryResolveRemoteDeployedRecipient
|
||||
|
||||
override val compressions = inboundCompressions
|
||||
|
|
|
|||
|
|
@ -172,8 +172,11 @@ private[remote] class OutboundControlJunction(
|
|||
|
||||
override def createLogicAndMaterializedValue(inheritedAttributes: Attributes) = {
|
||||
|
||||
val logic = new GraphStageLogic(shape) with InHandler with OutHandler with StageLogging
|
||||
with OutboundControlIngress {
|
||||
val logic = new GraphStageLogic(shape)
|
||||
with InHandler
|
||||
with OutHandler
|
||||
with StageLogging
|
||||
with OutboundControlIngress {
|
||||
|
||||
val sendControlMessageCallback = getAsyncCallback[ControlMessage](internalSendControlMessage)
|
||||
private val maxControlMessageBufferSize: Int = outboundContext.settings.Advanced.OutboundControlQueueSize
|
||||
|
|
|
|||
|
|
@ -292,8 +292,9 @@ final class SharedKillSwitch private[stream] (val name: String) extends KillSwit
|
|||
override def createLogicAndMaterializedValue(
|
||||
inheritedAttributes: Attributes): (GraphStageLogic, SharedKillSwitch) = {
|
||||
val shutdownListener = terminationSignal.createListener()
|
||||
val logic = new KillSwitches.KillableGraphStageLogic(shutdownListener.future, shape) with InHandler
|
||||
with OutHandler {
|
||||
val logic = new KillSwitches.KillableGraphStageLogic(shutdownListener.future, shape)
|
||||
with InHandler
|
||||
with OutHandler {
|
||||
setHandler(shape.in, this)
|
||||
setHandler(shape.out, this)
|
||||
|
||||
|
|
|
|||
|
|
@ -37,8 +37,9 @@ private object ActorRefBackpressureSource {
|
|||
private[akka] override def createLogicAndMaterializedValue(
|
||||
inheritedAttributes: Attributes,
|
||||
eagerMaterializer: Materializer): (GraphStageLogic, ActorRef) = {
|
||||
val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape) with StageLogging
|
||||
with ActorRefStage {
|
||||
val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape)
|
||||
with StageLogging
|
||||
with ActorRefStage {
|
||||
override protected def logSource: Class[_] = classOf[ActorRefSource[_]]
|
||||
|
||||
private var isCompleting: Boolean = false
|
||||
|
|
|
|||
|
|
@ -36,8 +36,9 @@ private object ActorRefSource {
|
|||
private[akka] override def createLogicAndMaterializedValue(
|
||||
inheritedAttributes: Attributes,
|
||||
eagerMaterializer: Materializer): (GraphStageLogic, ActorRef) = {
|
||||
val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape) with StageLogging
|
||||
with ActorRefStage {
|
||||
val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape)
|
||||
with StageLogging
|
||||
with ActorRefStage {
|
||||
override protected def logSource: Class[_] = classOf[ActorRefSource[_]]
|
||||
|
||||
private val buffer: OptionVal[Buffer[T]] =
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ import scala.util.control.NoStackTrace
|
|||
handleSubscriptionTimeout(
|
||||
target,
|
||||
new SubscriptionTimeoutException(s"Publisher was not attached to upstream within deadline ($millis) ms")
|
||||
with NoStackTrace)
|
||||
with NoStackTrace)
|
||||
|
||||
case p: Publisher[_] =>
|
||||
log.debug("Cancelling {} (after: {} ms)", p, millis)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue