Skip to content

Commit

Permalink
Idiomatic scala 3 code (#118)
Browse files Browse the repository at this point in the history
  • Loading branch information
RustedBones authored Dec 26, 2022
1 parent c52ad90 commit d5125d6
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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))"},
{code = "=", owner = "(Enumerator.Val|Defn.(Va(l|r)|Def|Type|Given))"},
{code = "{", owner = "Template"},
{code = "}", owner = "Template"},
{code = "->", owner = "Term.ApplyInfix"},
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import fr.davit.taxonomy.scodec.DnsCodec
import scodec.Codec

import java.net.InetAddress
import scala.concurrent.duration._
import scala.concurrent.duration*

object App extends IOApp.Simple {

Expand Down
10 changes: 5 additions & 5 deletions src/it/scala/fr/davit/scout/ZeroconfItSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ package fr.davit.scout

import cats.effect.IO
import fr.davit.taxonomy.fs2.Dns
import fr.davit.taxonomy.model._
import fr.davit.taxonomy.model.record._
import fr.davit.taxonomy.model.*
import fr.davit.taxonomy.model.record.*
import fr.davit.taxonomy.scodec.DnsCodec
import fs2._
import fs2.*
import munit.CatsEffectSuite
import scodec.Codec

import java.net.{Inet4Address, Inet6Address, InetAddress, InetSocketAddress}
import scala.concurrent.duration._
import scala.concurrent.duration.*

class ZeroconfItSpec extends CatsEffectSuite:

implicit val coder: Codec[DnsMessage] = DnsCodec.dnsMessage
given Codec[DnsMessage] = DnsCodec.dnsMessage

val googleCastService = Zeroconf.Service("awesomeservice", "tcp")

Expand Down
22 changes: 11 additions & 11 deletions src/main/scala/fr/davit/scout/Zeroconf.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
package fr.davit.scout

import cats.Show
import cats.effect._
import cats.implicits._
import cats.effect.*
import cats.implicits.*
import com.comcast.ip4s.{Dns => _, _}
import fr.davit.taxonomy.fs2.Dns
import fr.davit.taxonomy.model._
import fr.davit.taxonomy.model.record._
import fr.davit.taxonomy.model.*
import fr.davit.taxonomy.model.record.*
import fr.davit.taxonomy.scodec.DnsCodec
import fs2._
import fs2.*
import fs2.io.net.{DatagramSocket, Network, SocketOption}
import scodec.Codec

import java.net.{Inet4Address, Inet6Address, InetAddress, InetSocketAddress, NetworkInterface, StandardProtocolFamily}
import scala.concurrent.duration._
import java.net.*
import scala.concurrent.duration.*
import scala.collection.immutable
import scala.jdk.CollectionConverters._
import scala.jdk.CollectionConverters.*

object Zeroconf:

Expand Down Expand Up @@ -80,9 +80,9 @@ object Zeroconf:
LocalDnsMulticastPort.value
)

private implicit val codec: Codec[DnsMessage] = DnsCodec.dnsMessage
private implicit val showService: Show[Service] = Show(s => s"_${s.application}._${s.transport}.${s.domain}")
private implicit val showInstance: Show[Instance] = Show(i => s"${i.name}.${i.service.show}")
private given Codec[DnsMessage] = DnsCodec.dnsMessage
private given Show[Service] = Show(s => s"_${s.application}._${s.transport}.${s.domain}")
private given Show[Instance] = Show(i => s"${i.name}.${i.service.show}")

/** Find the IPv4 multicast network interfaces on the machine
* @return
Expand Down

0 comments on commit d5125d6

Please sign in to comment.