From ffe769b4dfe71338cf13f6e27e6259e1b8561e17 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 17 Dec 2019 13:31:34 +0100 Subject: [PATCH] Enable 'adapted args' warnings globally (#28391) * Enable 'adapted args' warnings globally * Nicer tuple notation --- .../src/main/scala/akka/io/dns/internal/DnsClient.scala | 6 +++--- project/AkkaDisciplinePlugin.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala b/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala index d7ff3a5615..95fa7db63c 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala @@ -82,21 +82,21 @@ import scala.concurrent.duration._ case Question4(id, name) => log.debug("Resolving [{}] (A)", name) val msg = message(name, id, RecordType.A) - inflightRequests += (id -> (sender(), msg)) + inflightRequests += (id -> (sender() -> msg)) log.debug("Message [{}] to [{}]: [{}]", id, ns, msg) socket ! Udp.Send(msg.write(), ns) case Question6(id, name) => log.debug("Resolving [{}] (AAAA)", name) val msg = message(name, id, RecordType.AAAA) - inflightRequests += (id -> (sender(), msg)) + inflightRequests += (id -> (sender() -> msg)) log.debug("Message to [{}]: [{}]", ns, msg) socket ! Udp.Send(msg.write(), ns) case SrvQuestion(id, name) => log.debug("Resolving [{}] (SRV)", name) val msg = message(name, id, RecordType.SRV) - inflightRequests += (id -> (sender(), msg)) + inflightRequests += (id -> (sender() -> msg)) log.debug("Message to [{}]: [{}]", ns, msg) socket ! Udp.Send(msg.write(), ns) diff --git a/project/AkkaDisciplinePlugin.scala b/project/AkkaDisciplinePlugin.scala index 782d3034f0..8ae24a7d1b 100644 --- a/project/AkkaDisciplinePlugin.scala +++ b/project/AkkaDisciplinePlugin.scala @@ -71,7 +71,7 @@ object AkkaDisciplinePlugin extends AutoPlugin with ScalafixSupport { /** * Remain visibly filtered for future code quality work and removing. */ - val undisciplineScalacOptions = Set("-Ywarn-value-discard", "-Ywarn-numeric-widen", "-Yno-adapted-args") + val undisciplineScalacOptions = Set("-Ywarn-value-discard", "-Ywarn-numeric-widen") /** These options are desired, but some are excluded for the time being*/ val disciplineScalacOptions = Set(