Update scalafmt-core to 3.10.5

.git-blame-ignore-revs

@@ -16,3 +16,6 @@ a904e917d5851ebffc5e1eabbee70cf1685c4263
 
 # Scala Steward: Reformat with scalafmt 3.10.4
 3a1f225850c219c27f8f1b30699aec4eea45923e
+
+# Scala Steward: Reformat with scalafmt 3.10.5
+66cba5fda8ea1213f1ee8d0732f25d1fc44aecdd

.scalafmt.conf

@@ -1,4 +1,4 @@
-version                                  = 3.10.4
+version                                  = 3.10.5
 runner.dialect                           = scala213
 project.git                              = true
 style                                    = defaultWithAlign

http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/MessageToFrameRendererBenchmark.scala

@@ -23,7 +23,14 @@ import scala.concurrent.Await
 import scala.concurrent.duration.{ Duration, DurationInt }
 
 import org.openjdk.jmh.annotations.{
-  Benchmark, BenchmarkMode, Mode, OperationsPerInvocation, OutputTimeUnit, Scope, State, TearDown
+  Benchmark,
+  BenchmarkMode,
+  Mode,
+  OperationsPerInvocation,
+  OutputTimeUnit,
+  Scope,
+  State,
+  TearDown
 }
 
 import org.apache.pekko

http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2RequestResponseBenchmark.scala

@@ -19,7 +19,13 @@ import org.apache.pekko
 import pekko.http.impl.engine.http2.FrameEvent.{ DataFrame, HeadersFrame }
 import pekko.http.impl.engine.http2.framing.FrameRenderer
 import pekko.http.scaladsl.model.{
-  AttributeKeys, ContentTypes, HttpEntity, HttpMethods, HttpRequest, HttpResponse, Trailer
+  AttributeKeys,
+  ContentTypes,
+  HttpEntity,
+  HttpMethods,
+  HttpRequest,
+  HttpResponse,
+  Trailer
 }
 import pekko.http.scaladsl.model.HttpEntity.{ Chunk, LastChunk }
 import pekko.http.scaladsl.model.headers.RawHeader

http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/PoolMasterActor.scala

@@ -16,7 +16,13 @@ package org.apache.pekko.http.impl.engine.client
 import org.apache.pekko
 import pekko.Done
 import pekko.actor.{
-  Actor, ActorLogging, ActorRef, DeadLetterSuppression, Deploy, ExtendedActorSystem, NoSerializationVerificationNeeded,
+  Actor,
+  ActorLogging,
+  ActorRef,
+  DeadLetterSuppression,
+  Deploy,
+  ExtendedActorSystem,
+  NoSerializationVerificationNeeded,
   Props
 }
 import pekko.annotation.InternalApi

http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2.scala

@@ -15,13 +15,21 @@ package org.apache.pekko.http.impl.engine.http2
 
 import org.apache.pekko
 import pekko.actor.{
-  ActorSystem, ClassicActorSystemProvider, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider
+  ActorSystem,
+  ClassicActorSystemProvider,
+  ExtendedActorSystem,
+  Extension,
+  ExtensionId,
+  ExtensionIdProvider
 }
 import pekko.annotation.InternalApi
 import pekko.event.LoggingAdapter
 import pekko.http.impl.engine.HttpConnectionIdleTimeoutBidi
 import pekko.http.impl.engine.server.{
-  GracefulTerminatorStage, MasterServerTerminator, ServerTerminator, UpgradeToOtherProtocolResponseHeader
+  GracefulTerminatorStage,
+  MasterServerTerminator,
+  ServerTerminator,
+  UpgradeToOtherProtocolResponseHeader
 }
 import pekko.http.impl.util.LogByteStringTools
 import pekko.http.scaladsl.Http.OutgoingConnection

http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Blueprint.scala

@@ -29,7 +29,11 @@ import pekko.http.impl.util.LogByteStringTools.logTLSBidiBySetting
 import pekko.http.impl.util.StreamUtils
 import pekko.http.scaladsl.model._
 import pekko.http.scaladsl.settings.{
-  ClientConnectionSettings, Http2ClientSettings, Http2ServerSettings, ParserSettings, ServerSettings
+  ClientConnectionSettings,
+  Http2ClientSettings,
+  Http2ServerSettings,
+  ParserSettings,
+  ServerSettings
 }
 import pekko.stream.{ BidiShape, Graph, StreamTcpException, ThrottleMode }
 import pekko.stream.TLSProtocol._

http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Demux.scala

@@ -34,7 +34,12 @@ import pekko.stream.Inlet
 import pekko.stream.Outlet
 import pekko.stream.scaladsl.Source
 import pekko.stream.stage.{
-  GraphStageLogic, GraphStageWithMaterializedValue, InHandler, OutHandler, StageLogging, TimerGraphStageLogic
+  GraphStageLogic,
+  GraphStageWithMaterializedValue,
+  InHandler,
+  OutHandler,
+  StageLogging,
+  TimerGraphStageLogic
 }
 import pekko.util.ByteString
 import pekko.util.OptionVal

http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParser.scala

@@ -28,7 +28,9 @@ import pekko.http.impl.util.HttpConstants._
 import pekko.http.scaladsl.model.{ ErrorInfo, HttpHeader, MediaTypes, StatusCode, StatusCodes }
 import pekko.http.scaladsl.model.headers.{ EmptyHeader, RawHeader }
 import pekko.http.scaladsl.settings.ParserSettings.{
-  ErrorLoggingVerbosity, IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode
+  ErrorLoggingVerbosity,
+  IllegalResponseHeaderNameProcessingMode,
+  IllegalResponseHeaderValueProcessingMode
 }
 import pekko.util.ByteString
 

http-core/src/main/scala/org/apache/pekko/http/impl/engine/server/HttpServerBluePrint.scala

@@ -32,7 +32,10 @@ import pekko.http.impl.engine.parsing.ParserOutput._
 import pekko.http.impl.engine.parsing._
 import pekko.http.impl.engine.rendering.ResponseRenderingContext.CloseRequested
 import pekko.http.impl.engine.rendering.{
-  DateHeaderRendering, HttpResponseRendererFactory, ResponseRenderingContext, ResponseRenderingOutput
+  DateHeaderRendering,
+  HttpResponseRendererFactory,
+  ResponseRenderingContext,
+  ResponseRenderingOutput
 }
 import pekko.http.impl.util._
 import pekko.http.javadsl.model

http-core/src/main/scala/org/apache/pekko/http/impl/model/parser/HeaderParser.scala

@@ -18,7 +18,8 @@ import pekko.annotation.InternalApi
 import pekko.http.scaladsl.settings.ParserSettings
 import pekko.http.scaladsl.settings.ParserSettings.CookieParsingMode
 import pekko.http.scaladsl.settings.ParserSettings.{
-  IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode
+  IllegalResponseHeaderNameProcessingMode,
+  IllegalResponseHeaderValueProcessingMode
 }
 import pekko.http.scaladsl.model.headers.HttpCookiePair
 import pekko.util.ConstantFun

http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala

@@ -18,8 +18,11 @@ import org.apache.pekko
 import pekko.annotation.InternalApi
 import pekko.http.impl.util._
 import pekko.http.scaladsl.settings.ParserSettings.{
-  ConflictingContentTypeHeaderProcessingMode, CookieParsingMode, ErrorLoggingVerbosity,
-  IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode
+  ConflictingContentTypeHeaderProcessingMode,
+  CookieParsingMode,
+  ErrorLoggingVerbosity,
+  IllegalResponseHeaderNameProcessingMode,
+  IllegalResponseHeaderValueProcessingMode
 }
 import pekko.http.scaladsl.model._
 import pekko.http.scaladsl.settings.ParserSettings

http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala

@@ -26,7 +26,11 @@ import pekko.NotUsed
 import pekko.annotation.InternalApi
 import pekko.http.impl.model.{ JavaQuery, JavaUri }
 import pekko.http.javadsl.{
-  model => jm, settings => js, ConnectionContext, HttpConnectionContext, HttpsConnectionContext
+  model => jm,
+  settings => js,
+  ConnectionContext,
+  HttpConnectionContext,
+  HttpsConnectionContext
 }
 import pekko.http.{ javadsl => jdsl, scaladsl => sdsl }
 import pekko.http.scaladsl.{ model => sm }

http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HttpConfigurationSpec.scala

@@ -16,7 +16,11 @@ package org.apache.pekko.http.impl.engine.client
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.http.scaladsl.settings.{
-  ClientConnectionSettings, ConnectionPoolSettings, HttpsProxySettings, ParserSettings, ServerSettings
+  ClientConnectionSettings,
+  ConnectionPoolSettings,
+  HttpsProxySettings,
+  ParserSettings,
+  ServerSettings
 }
 import pekko.testkit.PekkoSpec
 import com.typesafe.config.ConfigFactory

http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/NewConnectionPoolSpec.scala

@@ -26,7 +26,11 @@ import pekko.http.impl.engine.server.ServerTerminator
 import pekko.http.impl.engine.ws.ByteStringSinkProbe
 import pekko.http.impl.util._
 import pekko.http.scaladsl.Http.{
-  HostConnectionPool, HostConnectionPoolImpl, HttpServerTerminated, HttpTerminated, OutgoingConnection
+  HostConnectionPool,
+  HostConnectionPoolImpl,
+  HttpServerTerminated,
+  HttpTerminated,
+  OutgoingConnection
 }
 import pekko.http.scaladsl.model.HttpEntity.{ Chunk, ChunkStreamPart, Chunked, LastChunk }
 import pekko.http.scaladsl.model.{ HttpEntity, _ }

http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/PrepareResponseSpec.scala

@@ -17,7 +17,10 @@ import org.apache.pekko
 import pekko.http.impl.engine.client.OutgoingConnectionBlueprint.PrepareResponse
 import pekko.http.impl.engine.parsing.ParserOutput
 import pekko.http.impl.engine.parsing.ParserOutput.{
-  EntityChunk, EntityStreamError, StreamedEntityCreator, StrictEntityCreator
+  EntityChunk,
+  EntityStreamError,
+  StreamedEntityCreator,
+  StrictEntityCreator
 }
 import pekko.http.scaladsl.model._
 import pekko.http.scaladsl.settings.ParserSettings

http-core/src/test/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParserSpec.scala

@@ -28,7 +28,8 @@ import pekko.http.scaladsl.model.headers._
 import pekko.http.impl.model.parser.CharacterClasses
 import pekko.http.impl.util._
 import pekko.http.scaladsl.settings.ParserSettings.{
-  IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode
+  IllegalResponseHeaderNameProcessingMode,
+  IllegalResponseHeaderValueProcessingMode
 }
 import pekko.testkit.EventFilter
 

http-core/src/test/scala/org/apache/pekko/http/impl/engine/server/PrepareRequestsSpec.scala

@@ -16,7 +16,10 @@ package org.apache.pekko.http.impl.engine.server
 import org.apache.pekko
 import pekko.http.impl.engine.parsing.ParserOutput
 import pekko.http.impl.engine.parsing.ParserOutput.{
-  EntityChunk, EntityStreamError, StreamedEntityCreator, StrictEntityCreator
+  EntityChunk,
+  EntityStreamError,
+  StreamedEntityCreator,
+  StrictEntityCreator
 }
 import pekko.http.impl.engine.server.HttpServerBluePrint.PrepareRequests
 import pekko.http.scaladsl.model._

http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala

@@ -479,8 +479,18 @@ class MockFailingWritePath extends java.nio.file.Path { selfPath =>
   import java.nio.{ ByteBuffer, MappedByteBuffer }
   import java.nio.channels.{ FileChannel, FileLock, ReadableByteChannel, SeekableByteChannel, WritableByteChannel }
   import java.nio.file.{
-    AccessMode, CopyOption, DirectoryStream, FileStore, FileSystem, LinkOption, OpenOption, Path, PathMatcher,
-    WatchEvent, WatchKey, WatchService
+    AccessMode,
+    CopyOption,
+    DirectoryStream,
+    FileStore,
+    FileSystem,
+    LinkOption,
+    OpenOption,
+    Path,
+    PathMatcher,
+    WatchEvent,
+    WatchKey,
+    WatchService
   }
   import java.nio.file.attribute.{ BasicFileAttributes, FileAttribute, FileAttributeView, UserPrincipalLookupService }
   import java.nio.file.spi.FileSystemProvider

http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectivesSpec.scala

@@ -18,7 +18,10 @@ import pekko.http.scaladsl.model.StatusCodes
 import pekko.http.scaladsl.model.headers.`Sec-WebSocket-Protocol`
 import pekko.http.scaladsl.model.ws._
 import pekko.http.scaladsl.server.{
-  ExpectedWebSocketRequestRejection, Route, RoutingSpec, UnsupportedWebSocketSubprotocolRejection
+  ExpectedWebSocketRequestRejection,
+  Route,
+  RoutingSpec,
+  UnsupportedWebSocketSubprotocolRejection
 }
 import pekko.http.scaladsl.testkit.WSProbe
 import pekko.stream.OverflowStrategy

http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/BasicDirectives.scala

@@ -33,7 +33,13 @@ import pekko.http.impl.model.JavaUri
 import pekko.http.impl.util.JavaMapping
 import pekko.http.impl.util.Util.convertIterable
 import pekko.http.javadsl.model.{
-  HttpEntity, HttpHeader, HttpRequest, HttpResponse, RequestEntity, ResponseEntity, Uri
+  HttpEntity,
+  HttpHeader,
+  HttpRequest,
+  HttpResponse,
+  RequestEntity,
+  ResponseEntity,
+  Uri
 }
 import pekko.http.javadsl.server
 import pekko.http.javadsl.server._

http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/RouteDirectives.scala

@@ -22,7 +22,13 @@ import org.apache.pekko
 import pekko.http.impl.model.JavaUri
 import pekko.http.javadsl.marshalling.Marshaller
 import pekko.http.javadsl.model.{
-  HttpHeader, HttpRequest, HttpResponse, RequestEntity, ResponseEntity, StatusCode, Uri
+  HttpHeader,
+  HttpRequest,
+  HttpResponse,
+  RequestEntity,
+  ResponseEntity,
+  StatusCode,
+  Uri
 }
 import pekko.http.javadsl.server.{ Rejection, Route, RoutingJavaMapping }
 import pekko.http.javadsl.server.RoutingJavaMapping._

http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientServerSpec.scala

@@ -23,8 +23,19 @@ import pekko.http.impl.engine.ws.ByteStringSinkProbe
 import pekko.http.impl.util.{ ExampleHttpContexts, PekkoSpecWithMaterializer }
 import pekko.http.scaladsl.Http
 import pekko.http.scaladsl.model.{
-  headers, AttributeKey, ContentTypes, HttpEntity, HttpHeader, HttpMethod, HttpMethods, HttpRequest, HttpResponse,
-  RequestResponseAssociation, StatusCode, StatusCodes, Uri
+  headers,
+  AttributeKey,
+  ContentTypes,
+  HttpEntity,
+  HttpHeader,
+  HttpMethod,
+  HttpMethods,
+  HttpRequest,
+  HttpResponse,
+  RequestResponseAssociation,
+  StatusCode,
+  StatusCodes,
+  Uri
 }
 import pekko.http.scaladsl.model.headers.HttpEncodings
 import pekko.http.scaladsl.settings.ClientConnectionSettings

http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala

@@ -40,7 +40,11 @@ import pekko.http.scaladsl.model.HttpEntity.Chunked
 import pekko.http.scaladsl.model.HttpEntity.LastChunk
 import pekko.http.scaladsl.model.HttpMethods.GET
 import pekko.http.scaladsl.model.headers.{
-  `Access-Control-Allow-Origin`, `Cache-Control`, `Content-Length`, `Content-Type`, RawHeader
+  `Access-Control-Allow-Origin`,
+  `Cache-Control`,
+  `Content-Length`,
+  `Content-Type`,
+  RawHeader
 }
 import pekko.http.scaladsl.model.headers.CacheDirectives._
 import pekko.http.scaladsl.settings.ClientConnectionSettings

http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameSending.scala

@@ -17,7 +17,12 @@ import java.nio.ByteOrder
 
 import org.apache.pekko
 import pekko.http.impl.engine.http2.FrameEvent.{
-  ContinuationFrame, HeadersFrame, PriorityFrame, Setting, SettingsFrame, WindowUpdateFrame
+  ContinuationFrame,
+  HeadersFrame,
+  PriorityFrame,
+  Setting,
+  SettingsFrame,
+  WindowUpdateFrame
 }
 import pekko.http.impl.engine.http2.Http2Protocol.{ ErrorCode, Flags, FrameType, SettingIdentifier }
 import pekko.http.impl.engine.http2.framing.FrameRenderer

http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2PersistentClientSpec.scala

@@ -26,8 +26,20 @@ import pekko.http.impl.engine.ws.ByteStringSinkProbe
 import pekko.http.impl.util.{ ExampleHttpContexts, PekkoSpecWithMaterializer }
 import pekko.http.scaladsl.{ ClientTransport, Http }
 import pekko.http.scaladsl.model.{
-  headers, AttributeKey, AttributeKeys, ContentTypes, HttpEntity, HttpHeader, HttpMethod, HttpMethods, HttpRequest,
-  HttpResponse, RequestResponseAssociation, StatusCode, StatusCodes, Uri
+  headers,
+  AttributeKey,
+  AttributeKeys,
+  ContentTypes,
+  HttpEntity,
+  HttpHeader,
+  HttpMethod,
+  HttpMethods,
+  HttpRequest,
+  HttpResponse,
+  RequestResponseAssociation,
+  StatusCode,
+  StatusCodes,
+  Uri
 }
 import pekko.http.scaladsl.model.headers.HttpEncodings
 import pekko.http.scaladsl.settings.ClientConnectionSettings