Update scalafmt (zio#475)

hcwilhelm · Nov 4, 2021 · ea8fac8 · ea8fac8
1 parent f59cc6c
commit ea8fac8
Show file tree

Hide file tree

Showing 84 changed files with 149 additions and 153 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -8,14 +8,10 @@ docstrings.style = Asterisk
 lineEndings = preserve
 includeCurlyBraceInSelectChains = false
 danglingParentheses.preset = true
-spaces {
-  inImportCurlyBraces = true
-}
 optIn.annotationNewlines = true
 newlines.alwaysBeforeMultilineDef = false
-
+runner.dialect = scala213
 rewrite.rules = [RedundantBraces]
-
 rewrite.redundantBraces.generalExpressions = false
 rewriteTokens = {
   "⇒": "=>"

diff --git a/benchmarks/src/main/scala/zio/redis/BenchmarksUtils.scala b/benchmarks/src/main/scala/zio/redis/BenchmarksUtils.scala
@@ -1,11 +1,11 @@
 package zio.redis
 
-import cats.effect.{ IO => CatsIO }
+import cats.effect.{IO => CatsIO}
 
 import zio.logging.Logging
 import zio.redis.codec.StringUtf8Codec
 import zio.schema.codec.Codec
-import zio.{ BootstrapRuntime, ZIO, ZLayer }
+import zio.{BootstrapRuntime, ZIO, ZLayer}
 
 trait BenchmarksUtils {
   self: RedisClients with BootstrapRuntime =>

diff --git a/benchmarks/src/main/scala/zio/redis/RedisClients.scala b/benchmarks/src/main/scala/zio/redis/RedisClients.scala
@@ -1,7 +1,7 @@
 package zio.redis
 
 import cats.effect.unsafe.implicits.global
-import cats.effect.{ IO => CatsIO, _ }
+import cats.effect.{IO => CatsIO, _}
 import com.comcast.ip4s._
 import dev.profunktor.redis4cats.RedisCommands
 import dev.profunktor.redis4cats.data.RedisCodec

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HDelBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HDelBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hDel, hSet }
+import zio.redis.{BenchmarkRuntime, hDel, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HDelBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c => items.traverse_(it => c.send(cmd.hdel(Key.unsafeFrom(key), Key.unsafeFrom(it._1)))))

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HExistsBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HExistsBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hExists, hSet }
+import zio.redis.{BenchmarkRuntime, hExists, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HExistsBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HGetAllBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HGetAllBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hGetAll, hSet }
+import zio.redis.{BenchmarkRuntime, hGetAll, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HGetAllBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c => items.traverse_(_ => c.send(cmd.hgetall(Key.unsafeFrom(key)))))

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HGetBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HGetBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hGet, hSet }
+import zio.redis.{BenchmarkRuntime, hGet, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HGetBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HIncrbyBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HIncrbyBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hIncrBy, hSet }
+import zio.redis.{BenchmarkRuntime, hIncrBy, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -34,7 +34,7 @@ class HIncrbyBenchmarks extends BenchmarkRuntime {
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
     import cats.implicits.toFoldableOps
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>
       items.traverse_(it =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HIncrbyFloatBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HIncrbyFloatBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hIncrByFloat, hSet }
+import zio.redis.{BenchmarkRuntime, hIncrByFloat, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -33,7 +33,7 @@ class HIncrbyFloatBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HKeysBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HKeysBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hKeys, hSet }
+import zio.redis.{BenchmarkRuntime, hKeys, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HKeysBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c => items.traverse_(_ => c.send(cmd.hkeys(Key.unsafeFrom(key)))))

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HLenBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HLenBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hLen, hSet }
+import zio.redis.{BenchmarkRuntime, hLen, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HLenBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c => items.traverse_(_ => c.send(cmd.hlen(Key.unsafeFrom(key)))))

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HMGetBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HMGetBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hSet, hmGet }
+import zio.redis.{BenchmarkRuntime, hSet, hmGet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HMGetBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HMSetBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HMSetBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hmSet }
+import zio.redis.{BenchmarkRuntime, hmSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -29,7 +29,7 @@ class HMSetBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HSetBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HSetBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hSet }
+import zio.redis.{BenchmarkRuntime, hSet}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -29,7 +29,7 @@ class HSetBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HSetNxBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HSetNxBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hSetNx }
+import zio.redis.{BenchmarkRuntime, hSetNx}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -29,7 +29,7 @@ class HSetNxBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HStrLenBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HStrLenBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hSet, hStrLen }
+import zio.redis.{BenchmarkRuntime, hSet, hStrLen}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -28,7 +28,7 @@ class HStrLenBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c =>

diff --git a/benchmarks/src/main/scala/zio/redis/hash/HValsBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/hash/HValsBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, hSet, hVals }
+import zio.redis.{BenchmarkRuntime, hSet, hVals}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -30,7 +30,7 @@ class HValsBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.implicits.toFoldableOps
     import cats.instances.list._
     unsafeRun[LaserDiscClient](c => items.traverse_(_ => c.send(cmd.hvals(Key.unsafeFrom(key)))))

diff --git a/benchmarks/src/main/scala/zio/redis/lists/BlPopBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/lists/BlPopBenchmarks.scala
@@ -6,7 +6,7 @@ import org.openjdk.jmh.annotations._
 
 import zio.ZIO
 import zio.duration._
-import zio.redis.{ BenchmarkRuntime, blPop, rPush }
+import zio.redis.{BenchmarkRuntime, blPop, rPush}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -31,7 +31,7 @@ class BlPopBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.instances.list._
     import cats.syntax.foldable._
 

diff --git a/benchmarks/src/main/scala/zio/redis/lists/BrPopBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/lists/BrPopBenchmarks.scala
@@ -6,7 +6,7 @@ import org.openjdk.jmh.annotations._
 
 import zio.ZIO
 import zio.duration._
-import zio.redis.{ BenchmarkRuntime, brPop, rPush }
+import zio.redis.{BenchmarkRuntime, brPop, rPush}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -31,7 +31,7 @@ class BrPopBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.instances.list._
     import cats.syntax.foldable._
 

diff --git a/benchmarks/src/main/scala/zio/redis/lists/BrPopLPushBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/lists/BrPopLPushBenchmarks.scala
@@ -6,7 +6,7 @@ import org.openjdk.jmh.annotations._
 
 import zio.ZIO
 import zio.duration._
-import zio.redis.{ BenchmarkRuntime, brPopLPush, del, rPush }
+import zio.redis.{BenchmarkRuntime, brPopLPush, del, rPush}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -35,7 +35,7 @@ class BrPopLPushBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.instances.list._
     import cats.syntax.foldable._
 

diff --git a/benchmarks/src/main/scala/zio/redis/lists/LIndexBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/lists/LIndexBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, del, lIndex, rPush }
+import zio.redis.{BenchmarkRuntime, del, lIndex, rPush}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -34,7 +34,7 @@ class LIndexBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.instances.list._
     import cats.syntax.foldable._
 

diff --git a/benchmarks/src/main/scala/zio/redis/lists/LInsertBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/lists/LInsertBenchmarks.scala
@@ -34,7 +34,7 @@ class LInsertBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import _root_.laserdisc.lists.listtypes._
     import cats.instances.list._
     import cats.syntax.foldable._

diff --git a/benchmarks/src/main/scala/zio/redis/lists/LLenBenchmarks.scala b/benchmarks/src/main/scala/zio/redis/lists/LLenBenchmarks.scala
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 
 import zio.ZIO
-import zio.redis.{ BenchmarkRuntime, lLen }
+import zio.redis.{BenchmarkRuntime, lLen}
 
 @State(Scope.Thread)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -28,7 +28,7 @@ class LLenBenchmarks extends BenchmarkRuntime {
   @Benchmark
   def laserdisc(): Unit = {
     import _root_.laserdisc.fs2._
-    import _root_.laserdisc.{ all => cmd, _ }
+    import _root_.laserdisc.{all => cmd, _}
     import cats.instances.list._
     import cats.syntax.foldable._