Skip to content

Commit

Permalink
Configure scalfmt for scala 3 new syntax (#121)
Browse files Browse the repository at this point in the history
  • Loading branch information
RustedBones committed Dec 27, 2022
1 parent b24c779 commit 71d1e5a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 30 deletions.
27 changes: 9 additions & 18 deletions .scalafmt.conf
@@ -1,23 +1,14 @@
version = 3.6.1
project.git = true # only format files tracked by git
maxColumn = 120
runner.dialect = scala3
align.openParenCallSite = false
align.openParenDefnSite = false
# setting 'align = more' tokens explicitly to work with other align options
align.tokens = [
{code = "=", owner = "(Enumerator.Val|Defn.(Va(l|r)|Def|Type|Given))"},
{code = "{", owner = "Template"},
{code = "}", owner = "Template"},
{code = "->", owner = "Term.ApplyInfix"},
{code = "<-", owner = "Enumerator.Generator"},
{code = "=>", owner = "Case"},
{code = "%", owner = "Term.ApplyInfix"},
{code = "%%", owner = "Term.ApplyInfix"},
{code = "%%%", owner = "Term.ApplyInfix"}
]
project.git = true
maxColumn = 120
align.preset = more
assumeStandardLibraryStripMargin = true
rewrite.rules = [
PreferCurlyFors,
SortImports
]
SortModifiers,
Imports
]
rewrite.imports.sort = scalastyle
rewrite.scala3.convertToNewSyntax = true
rewrite.scala3.removeOptionalBraces = true
22 changes: 10 additions & 12 deletions src/main/scala/fr/davit/scout/Zeroconf.scala
Expand Up @@ -19,7 +19,7 @@ package fr.davit.scout
import cats.Show
import cats.effect.*
import cats.implicits.*
import com.comcast.ip4s.{Dns => _, _}
import com.comcast.ip4s.{Dns as _, *}
import fr.davit.taxonomy.fs2.Dns
import fr.davit.taxonomy.model.*
import fr.davit.taxonomy.model.record.*
Expand Down Expand Up @@ -139,7 +139,7 @@ object Zeroconf:
val packet = DnsPacket(LocalDnsMulticastAddress, message)

def serviceInstance(dnsMessage: DnsMessage): Option[Instance] =
for {
for
ptr <- dnsMessage.answers.collectFirst {
case DnsResourceRecord(question.name, _, question.`class`, _, DnsPTRRecordData(ptr)) => ptr
}
Expand All @@ -149,7 +149,7 @@ object Zeroconf:
txt <- dnsMessage.additionals.collectFirst {
case DnsResourceRecord(`ptr`, _, question.`class`, _, DnsTXTRecordData(txt)) => txt
}
} yield {
yield
val information = txt
.map(_.split('='))
.collect {
Expand All @@ -164,7 +164,6 @@ object Zeroconf:
case DnsResourceRecord(`target`, _, question.`class`, _, DnsAAAARecordData(ipv6)) => ipv6
}
Instance(service, ptr, port, target, information, addresses)
}
end serviceInstance

val exponentialDelay = Stream.emit(()) ++ Stream
Expand Down Expand Up @@ -242,7 +241,7 @@ object Zeroconf:
cacheFlush = true,
`class` = DnsRecordClass.Internet,
ttl = ttl,
data = DnsTXTRecordData(instance.information.map { case (k, v) => if (v.isEmpty) k else s"$k=$v" }.toList)
data = DnsTXTRecordData(instance.information.map { case (k, v) => if v.isEmpty then k else s"$k=$v" }.toList)
)

val as = addresses
Expand Down Expand Up @@ -281,13 +280,12 @@ object Zeroconf:
.fold(networkInterfaces())(Stream.emit)
.flatMap(itf => Stream.resource(localMulticastSocket(itf)))
.evalMap { socket =>
val response = if (instance.addresses.isEmpty) {
socket.localAddress
.map(_.toInetSocketAddress.getAddress)
.map(addr => serviceResponse(Seq(addr)))
} else {
Sync[F].pure(serviceResponse(instance.addresses))
}
val response =
if instance.addresses.isEmpty then
socket.localAddress
.map(_.toInetSocketAddress.getAddress)
.map(addr => serviceResponse(Seq(addr)))
else Sync[F].pure(serviceResponse(instance.addresses))
response.map(resp => (socket, resp))
}
.map { case (socket, response) =>
Expand Down

0 comments on commit 71d1e5a

Please sign in to comment.