export concurrent.Future

BurraAbhishek · Jan 29, 2023 · ef49cdc · ef49cdc
1 parent a4de494
commit ef49cdc
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 21 deletions.
diff --git a/app/Env.scala b/app/Env.scala
@@ -5,7 +5,6 @@ import com.softwaremill.macwire.*
 import play.api.libs.ws.StandaloneWSClient
 import play.api.mvc.{ ControllerComponents, SessionCookieBaker }
 import play.api.{ Configuration, Environment, Mode }
-import scala.concurrent.Future
 
 import lila.common.config.*
 import lila.common.{ Bus, Strings, UserIds }

diff --git a/app/controllers/LilaController.scala b/app/controllers/LilaController.scala
@@ -34,7 +34,7 @@ abstract private[controllers] class LilaController(val env: Env)
   protected given Zero[Result] = Zero(Results.NotFound)
 
   extension (result: Result)
-    def toFuccess                         = scala.concurrent.Future successful result
+    def toFuccess                         = Future successful result
     def flashSuccess(msg: String): Result = result.flashing("success" -> msg)
     def flashSuccess: Result              = flashSuccess("")
     def flashFailure(msg: String): Result = result.flashing("failure" -> msg)

diff --git a/app/http/ErrorHandler.scala b/app/http/ErrorHandler.scala
@@ -6,7 +6,6 @@ import play.api.mvc.*
 import play.api.mvc.Results.*
 import play.api.routing.*
 import play.api.{ Configuration, Environment, UsefulException }
-import scala.concurrent.Future
 
 import lila.common.HTTPRequest
 

diff --git a/modules/common/src/main/Chronometer.scala b/modules/common/src/main/Chronometer.scala
@@ -1,6 +1,5 @@
 package lila.common
 
-import scala.concurrent.Future
 import scala.util.Try
 import lila.Lila.Fu
 

diff --git a/modules/common/src/main/base/LilaLibraryExtensions.scala b/modules/common/src/main/base/LilaLibraryExtensions.scala
@@ -6,7 +6,7 @@ import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit
 import java.lang.Math.{ max, min }
 import org.joda.time.{ DateTime, Duration }
-import scala.concurrent.{ Await, Future, ExecutionContext as EC }
+import scala.concurrent.{ Await, ExecutionContext as EC }
 import scala.util.matching.Regex
 import scala.util.Try
 

diff --git a/modules/common/src/main/base/LilaTypes.scala b/modules/common/src/main/base/LilaTypes.scala
@@ -1,6 +1,5 @@
 package lila.base
 
-import scala.concurrent.Future
 import ornicar.scalalib.newtypes.*
 
 import org.joda.time.DateTime
@@ -13,7 +12,7 @@ trait LilaTypes:
   type Funit     = Fu[Unit]
   type PairOf[A] = (A, A)
 
-  export scala.concurrent.{ ExecutionContext as Executor, Promise }
+  export scala.concurrent.{ ExecutionContext as Executor, Future, Promise }
   export scala.concurrent.duration.{ DurationInt, DurationLong, IntMult, Duration, FiniteDuration }
 
   def fuccess[A](a: A): Fu[A]        = Future.successful(a)

diff --git a/modules/db/src/main/Db.scala b/modules/db/src/main/Db.scala
@@ -1,7 +1,6 @@
 package lila.db
 
 import reactivemongo.api.*
-import scala.concurrent.Future
 
 import lila.common.Chronometer
 import lila.common.config.CollName

diff --git a/modules/fishnet/src/main/FishnetRedis.scala b/modules/fishnet/src/main/FishnetRedis.scala
@@ -4,7 +4,6 @@ import akka.actor.CoordinatedShutdown
 import chess.format.Uci
 import io.lettuce.core.*
 import io.lettuce.core.pubsub.*
-import scala.concurrent.Future
 
 import lila.common.{ Bus, Lilakka }
 import lila.hub.actorApi.map.{ Tell, TellAll }

diff --git a/modules/hub/src/main/SyncActor.scala b/modules/hub/src/main/SyncActor.scala
@@ -3,7 +3,6 @@ package lila.hub
 import java.util.concurrent.atomic.AtomicReference
 import java.util.function.UnaryOperator
 import scala.collection.immutable.Queue
-import scala.concurrent.{ Future, Promise }
 
 /*
  * Like an actor, but not an actor.

diff --git a/modules/mailer/src/main/Mailer.scala b/modules/mailer/src/main/Mailer.scala
@@ -4,7 +4,7 @@ import akka.actor.ActorSystem
 import lila.common.autoconfig.*
 import play.api.i18n.Lang
 import play.api.libs.mailer.{ Email, SMTPConfiguration, SMTPMailer }
-import scala.concurrent.{ blocking, Future }
+import scala.concurrent.blocking
 import scalatags.Text.all.{ html as htmlTag, * }
 import scalatags.Text.tags2.{ title as titleTag }
 import ornicar.scalalib.ThreadLocalRandom

diff --git a/modules/notify/src/main/NotifyApi.scala b/modules/notify/src/main/NotifyApi.scala
@@ -1,7 +1,6 @@
 package lila.notify
 
 import play.api.libs.json.Json
-import scala.concurrent.Future
 
 import lila.common.Bus
 import lila.common.config.MaxPerPage

diff --git a/modules/push/src/main/FirebasePush.scala b/modules/push/src/main/FirebasePush.scala
@@ -5,7 +5,7 @@ import lila.common.autoconfig.*
 import play.api.libs.json.*
 import play.api.libs.ws.JsonBodyWritables.*
 import play.api.libs.ws.StandaloneWSClient
-import scala.concurrent.{ blocking, Future }
+import scala.concurrent.blocking
 
 import lila.common.Chronometer
 import lila.memo.FrequencyThreshold

diff --git a/modules/relay/src/main/RelayFetch.scala b/modules/relay/src/main/RelayFetch.scala
@@ -226,7 +226,7 @@ final private class RelayFetch(
   private def httpGetJson[A: Reads](url: URL): Fu[A] =
     for {
       str  <- httpGet(url)
-      json <- scala.concurrent.Future(Json parse str) // Json.parse throws exceptions (!)
+      json <- Future(Json parse str) // Json.parse throws exceptions (!)
       data <-
         implicitly[Reads[A]]
           .reads(json)

diff --git a/modules/socket/src/main/RemoteSocket.scala b/modules/socket/src/main/RemoteSocket.scala
@@ -7,7 +7,6 @@ import io.lettuce.core.pubsub.StatefulRedisPubSubConnection as PubSub
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.ConcurrentHashMap
 import play.api.libs.json.*
-import scala.concurrent.{ Future, Promise }
 import scala.util.chaining.*
 import lila.socket.Socket.Sri
 import ornicar.scalalib.ThreadLocalRandom

diff --git a/modules/streamer/src/main/YouTubeApi.scala b/modules/streamer/src/main/YouTubeApi.scala
@@ -33,7 +33,7 @@ final private class YouTubeApi(
       .distinct
       .grouped(maxResults)
 
-    cfg.googleApiKey.value.nonEmpty ?? scala.concurrent.Future
+    cfg.googleApiKey.value.nonEmpty ?? Future
       .sequence {
         idPages.map { idPage =>
           ws.url("https://youtube.googleapis.com/youtube/v3/videos")

diff --git a/modules/timeline/src/main/TimelinePush.scala b/modules/timeline/src/main/TimelinePush.scala
@@ -34,7 +34,7 @@ final private[timeline] class TimelinePush(
   }
 
   private def propagate(propagations: List[Propagation]): Fu[List[UserId]] =
-    scala.concurrent.Future.traverse(propagations) {
+    Future.traverse(propagations) {
       case Propagation.Users(ids)    => fuccess(ids)
       case Propagation.Followers(id) => relationApi.freshFollowersFromSecondary(id)
       case Propagation.Friends(id)   => relationApi.fetchFriends(id)

diff --git a/modules/tutor/src/main/TutorBuilder.scala b/modules/tutor/src/main/TutorBuilder.scala
@@ -3,7 +3,6 @@ package lila.tutor
 import akka.stream.scaladsl.*
 import chess.Color
 import org.joda.time.DateTime
-import scala.concurrent.Future
 
 import lila.analyse.{ Analysis, AnalysisRepo }
 import lila.common.IpAddress

diff --git a/modules/tutor/src/main/TutorPerfReport.scala b/modules/tutor/src/main/TutorPerfReport.scala
@@ -126,7 +126,7 @@ private object TutorPerfReport:
       clockUsers = users.filter(_.perfType != PerfType.Correspondence).toNel
       globalClock <- clockUsers.?? { answerManyPerfs(globalClockQuestion, _).dmap(some) }
       clockUsage  <- clockUsers.?? { TutorClockUsage.compute(_).dmap(some) }
-      perfReports <- scala.concurrent.Future sequence users.toList.map { user =>
+      perfReports <- Future sequence users.toList.map { user =>
         for
           openings <- TutorOpening compute user
           phases   <- TutorPhases compute user

diff --git a/modules/video/src/main/VideoSheet.scala b/modules/video/src/main/VideoSheet.scala
@@ -5,7 +5,6 @@ import play.api.libs.json.*
 import play.api.libs.ws.StandaloneWSClient
 import play.api.libs.ws.JsonBodyReadables.*
 import scala.annotation.nowarn
-import scala.concurrent.Future
 
 final private class VideoSheet(
     ws: StandaloneWSClient,

diff --git a/modules/video/src/main/Youtube.scala b/modules/video/src/main/Youtube.scala
@@ -4,7 +4,6 @@ import org.joda.time.DateTime
 import play.api.libs.json.*
 import play.api.libs.ws.JsonBodyReadables.*
 import play.api.libs.ws.StandaloneWSClient
-import scala.concurrent.Future
 import ornicar.scalalib.ThreadLocalRandom
 
 import lila.common.config.*