From ec1963844b3e3f150ed1276c5229e3cc5e922721 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 15 Apr 2024 15:17:59 +0200 Subject: [PATCH] Use simple gears > java/scala > everything else rules --- .scalafmt.conf | 7 +------ jvm/src/main/scala/PosixLikeIO/PIO.scala | 1 - .../scala/PosixLikeIO/examples/clientAndServerUDP.scala | 1 - .../main/scala/PosixLikeIO/examples/readAndWriteFile.scala | 1 - .../main/scala/PosixLikeIO/examples/readWholeFile.scala | 1 - jvm/src/main/scala/async/VThreadSupport.scala | 1 - jvm/src/main/scala/measurements/measureTimes.scala | 1 - jvm/src/test/scala/CancellationBehavior.scala | 1 - native/src/main/scala/async/ForkJoinSupport.scala | 1 - shared/src/main/scala/async/Async.scala | 1 - shared/src/main/scala/async/AsyncOperations.scala | 1 - shared/src/main/scala/async/Listener.scala | 1 - shared/src/main/scala/async/Timer.scala | 1 - shared/src/main/scala/async/futures.scala | 1 - shared/src/test/scala/CancellationBehavior.scala | 1 - shared/src/test/scala/ChannelBehavior.scala | 1 - shared/src/test/scala/FutureBehavior.scala | 1 - shared/src/test/scala/ListenerBehavior.scala | 1 - shared/src/test/scala/SourceBehavior.scala | 1 - shared/src/test/scala/Stress.scala | 1 - shared/src/test/scala/TimerBehavior.scala | 1 - 21 files changed, 1 insertion(+), 26 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e55e5cea..972e2d6c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -12,12 +12,7 @@ rewrite { sort = ascii groups = [ ["gears\\..*"], - ["scala\\.meta\\..*", "org\\.scalameta\\..*"], - ["sbt\\..*"], - ["java.?\\..*"], - ["scala\\..*"], - ["org\\..*"], - ["com\\..*"], + ["java.?\\..*", "scala\\..*"], ] } } diff --git a/jvm/src/main/scala/PosixLikeIO/PIO.scala b/jvm/src/main/scala/PosixLikeIO/PIO.scala index 697c608f..c61eca85 100644 --- a/jvm/src/main/scala/PosixLikeIO/PIO.scala +++ b/jvm/src/main/scala/PosixLikeIO/PIO.scala @@ -10,7 +10,6 @@ import java.nio.channels.{AsynchronousFileChannel, CompletionHandler, SocketChan import java.nio.charset.{Charset, StandardCharsets} import java.nio.file.{Path, StandardOpenOption} import java.util.concurrent.CancellationException - import scala.Tuple.Union import scala.concurrent.ExecutionContext import scala.util.{Failure, Success, Try} diff --git a/jvm/src/main/scala/PosixLikeIO/examples/clientAndServerUDP.scala b/jvm/src/main/scala/PosixLikeIO/examples/clientAndServerUDP.scala index 72e3d07d..a1c30b41 100644 --- a/jvm/src/main/scala/PosixLikeIO/examples/clientAndServerUDP.scala +++ b/jvm/src/main/scala/PosixLikeIO/examples/clientAndServerUDP.scala @@ -7,7 +7,6 @@ import gears.async.{Async, Future} import java.net.DatagramPacket import java.nio.ByteBuffer import java.nio.file.StandardOpenOption - import scala.concurrent.ExecutionContext import PosixLikeIO.{PIOHelper, SocketUDP} diff --git a/jvm/src/main/scala/PosixLikeIO/examples/readAndWriteFile.scala b/jvm/src/main/scala/PosixLikeIO/examples/readAndWriteFile.scala index 53b7c8c0..a2bf39a9 100644 --- a/jvm/src/main/scala/PosixLikeIO/examples/readAndWriteFile.scala +++ b/jvm/src/main/scala/PosixLikeIO/examples/readAndWriteFile.scala @@ -6,7 +6,6 @@ import gears.async.default.given import java.nio.ByteBuffer import java.nio.charset.StandardCharsets import java.nio.file.StandardOpenOption - import scala.concurrent.ExecutionContext import PosixLikeIO.PIOHelper diff --git a/jvm/src/main/scala/PosixLikeIO/examples/readWholeFile.scala b/jvm/src/main/scala/PosixLikeIO/examples/readWholeFile.scala index 35d0e098..7811122c 100644 --- a/jvm/src/main/scala/PosixLikeIO/examples/readWholeFile.scala +++ b/jvm/src/main/scala/PosixLikeIO/examples/readWholeFile.scala @@ -6,7 +6,6 @@ import gears.async.default.given import java.nio.ByteBuffer import java.nio.charset.StandardCharsets import java.nio.file.StandardOpenOption - import scala.concurrent.ExecutionContext import PosixLikeIO.PIOHelper diff --git a/jvm/src/main/scala/async/VThreadSupport.scala b/jvm/src/main/scala/async/VThreadSupport.scala index 37cc376c..8b2dc371 100644 --- a/jvm/src/main/scala/async/VThreadSupport.scala +++ b/jvm/src/main/scala/async/VThreadSupport.scala @@ -2,7 +2,6 @@ package gears.async import java.lang.invoke.{MethodHandles, VarHandle} import java.util.concurrent.locks.ReentrantLock - import scala.annotation.unchecked.uncheckedVariance import scala.concurrent.duration.FiniteDuration diff --git a/jvm/src/main/scala/measurements/measureTimes.scala b/jvm/src/main/scala/measurements/measureTimes.scala index 5464e85e..1b3c4e6f 100644 --- a/jvm/src/main/scala/measurements/measureTimes.scala +++ b/jvm/src/main/scala/measurements/measureTimes.scala @@ -6,7 +6,6 @@ import gears.async.{Async, BufferedChannel, ChannelMultiplexer, Future, SyncChan import java.io.{FileReader, FileWriter} import java.nio.file.{Files, NoSuchFileException, Paths, StandardOpenOption} import java.util.concurrent.atomic.AtomicInteger - import scala.collection.mutable import scala.collection.mutable.{ArrayBuffer, HashMap} import scala.concurrent.ExecutionContext diff --git a/jvm/src/test/scala/CancellationBehavior.scala b/jvm/src/test/scala/CancellationBehavior.scala index 62259eea..7e214f0a 100644 --- a/jvm/src/test/scala/CancellationBehavior.scala +++ b/jvm/src/test/scala/CancellationBehavior.scala @@ -3,7 +3,6 @@ import gears.async.default.given import gears.async.{Async, AsyncSupport, Future, uninterruptible} import java.util.concurrent.CancellationException - import scala.concurrent.duration.{Duration, DurationInt} import scala.util.Properties import scala.util.Success diff --git a/native/src/main/scala/async/ForkJoinSupport.scala b/native/src/main/scala/async/ForkJoinSupport.scala index d8c0af7b..731c6d70 100644 --- a/native/src/main/scala/async/ForkJoinSupport.scala +++ b/native/src/main/scala/async/ForkJoinSupport.scala @@ -6,7 +6,6 @@ import gears.async._ import java.util.concurrent.CancellationException import java.util.concurrent.ForkJoinPool import java.util.concurrent.atomic.AtomicBoolean - import scala.concurrent.ExecutionContext import scala.concurrent.JavaConversions._ import scala.concurrent.duration._ diff --git a/shared/src/main/scala/async/Async.scala b/shared/src/main/scala/async/Async.scala index 92c34a9b..8ca6127d 100644 --- a/shared/src/main/scala/async/Async.scala +++ b/shared/src/main/scala/async/Async.scala @@ -5,7 +5,6 @@ import gears.async.Listener.withLock import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.locks.ReentrantLock - import scala.collection.mutable import scala.util.boundary diff --git a/shared/src/main/scala/async/AsyncOperations.scala b/shared/src/main/scala/async/AsyncOperations.scala index 343b5199..9b00cd86 100644 --- a/shared/src/main/scala/async/AsyncOperations.scala +++ b/shared/src/main/scala/async/AsyncOperations.scala @@ -3,7 +3,6 @@ package gears.async import gears.async.AsyncOperations.sleep import java.util.concurrent.TimeoutException - import scala.concurrent.duration.FiniteDuration /** Defines fundamental operations that require the support of the scheduler. This is commonly provided alongside with diff --git a/shared/src/main/scala/async/Listener.scala b/shared/src/main/scala/async/Listener.scala index bb24a83b..8ab8d57c 100644 --- a/shared/src/main/scala/async/Listener.scala +++ b/shared/src/main/scala/async/Listener.scala @@ -3,7 +3,6 @@ package gears.async import gears.async.Async.Source import java.util.concurrent.locks.ReentrantLock - import scala.annotation.tailrec /** A listener, representing an one-time value receiver of an [[Async.Source]]. diff --git a/shared/src/main/scala/async/Timer.scala b/shared/src/main/scala/async/Timer.scala index 8854ce88..fbce50c3 100644 --- a/shared/src/main/scala/async/Timer.scala +++ b/shared/src/main/scala/async/Timer.scala @@ -4,7 +4,6 @@ import gears.async.Listener import java.util.concurrent.CancellationException import java.util.concurrent.TimeoutException - import scala.annotation.tailrec import scala.collection.mutable import scala.concurrent.TimeoutException diff --git a/shared/src/main/scala/async/futures.scala b/shared/src/main/scala/async/futures.scala index 3f16eccd..f5b839fd 100644 --- a/shared/src/main/scala/async/futures.scala +++ b/shared/src/main/scala/async/futures.scala @@ -2,7 +2,6 @@ package gears.async import java.util.concurrent.CancellationException import java.util.concurrent.atomic.AtomicBoolean - import scala.annotation.tailrec import scala.annotation.unchecked.uncheckedVariance import scala.collection.mutable diff --git a/shared/src/test/scala/CancellationBehavior.scala b/shared/src/test/scala/CancellationBehavior.scala index 36940d33..448247c0 100644 --- a/shared/src/test/scala/CancellationBehavior.scala +++ b/shared/src/test/scala/CancellationBehavior.scala @@ -3,7 +3,6 @@ import gears.async.default.given import gears.async.{Async, AsyncSupport, Future, uninterruptible} import java.util.concurrent.CancellationException - import scala.concurrent.duration.{Duration, DurationInt} import scala.util.Success import scala.util.boundary diff --git a/shared/src/test/scala/ChannelBehavior.scala b/shared/src/test/scala/ChannelBehavior.scala index ed775690..49c60e5b 100644 --- a/shared/src/test/scala/ChannelBehavior.scala +++ b/shared/src/test/scala/ChannelBehavior.scala @@ -15,7 +15,6 @@ import gears.async.{ import java.nio.ByteBuffer import java.util.concurrent.CancellationException import java.util.concurrent.atomic.AtomicInteger - import scala.collection.Stepper.UnboxingFloatStepper import scala.collection.mutable import scala.collection.mutable.{ArrayBuffer, Set} diff --git a/shared/src/test/scala/FutureBehavior.scala b/shared/src/test/scala/FutureBehavior.scala index 9a9f2370..e596d672 100644 --- a/shared/src/test/scala/FutureBehavior.scala +++ b/shared/src/test/scala/FutureBehavior.scala @@ -6,7 +6,6 @@ import gears.async.{Async, Future, Task, TaskSchedule, uninterruptible} import java.util.concurrent.CancellationException import java.util.concurrent.atomic.AtomicInteger - import scala.collection.mutable import scala.collection.mutable.Set import scala.concurrent.ExecutionContext diff --git a/shared/src/test/scala/ListenerBehavior.scala b/shared/src/test/scala/ListenerBehavior.scala index 513ff3f9..e7893665 100644 --- a/shared/src/test/scala/ListenerBehavior.scala +++ b/shared/src/test/scala/ListenerBehavior.scala @@ -10,7 +10,6 @@ import gears.async.listeners.ConflictingLocksException import gears.async.listeners.lockBoth import java.util.concurrent.atomic.AtomicBoolean - import scala.collection.mutable.Buffer import scala.util.Success diff --git a/shared/src/test/scala/SourceBehavior.scala b/shared/src/test/scala/SourceBehavior.scala index b64d03e5..ad09b062 100644 --- a/shared/src/test/scala/SourceBehavior.scala +++ b/shared/src/test/scala/SourceBehavior.scala @@ -3,7 +3,6 @@ import gears.async.default.given import gears.async.{Async, Future, Listener} import java.util.concurrent.CancellationException - import scala.concurrent.ExecutionContext import scala.util.Random import scala.util.{Failure, Success, Try} diff --git a/shared/src/test/scala/Stress.scala b/shared/src/test/scala/Stress.scala index dece1762..47b4dabb 100644 --- a/shared/src/test/scala/Stress.scala +++ b/shared/src/test/scala/Stress.scala @@ -5,7 +5,6 @@ import gears.async.default.given import gears.async.{Async, AsyncSupport, Future, uninterruptible} import java.util.concurrent.atomic.AtomicInteger - import scala.concurrent.duration._ class StressTest extends munit.FunSuite: diff --git a/shared/src/test/scala/TimerBehavior.scala b/shared/src/test/scala/TimerBehavior.scala index 8828823d..a58937ec 100644 --- a/shared/src/test/scala/TimerBehavior.scala +++ b/shared/src/test/scala/TimerBehavior.scala @@ -3,7 +3,6 @@ import gears.async._ import java.util.concurrent.CancellationException import java.util.concurrent.TimeoutException - import scala.concurrent.duration._ import scala.util.Try import scala.util.{Failure, Success}