Skip to content

Commit 7167d5b

Browse files
mijicdmijicd
authored
Integrate scalafix (zio#556)
1 parent 80ed250 commit 7167d5b

File tree

99 files changed

+222
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+222
-253
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Cache scala dependencies
3131
uses: coursier/cache-action@v6
3232
- name: Check code formatting
33-
run: ./sbt fmtCheck
33+
run: ./sbt check
3434

3535
publishLocal:
3636
runs-on: ubuntu-20.04

‎.scalafix.conf

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
rules = [
2+
DisableSyntax
3+
ExplicitResultTypes
4+
LeakingImplicitClassVal
5+
NoAutoTupling
6+
NoValInForComprehension
7+
OrganizeImports
8+
ProcedureSyntax
9+
RemoveUnused
10+
]
11+
12+
OrganizeImports {
13+
# Allign with IntelliJ IDEA so that they don't fight each other
14+
groupedImports = Merge
15+
}
16+
17+
RemoveUnused {
18+
imports = false // handled by OrganizeImports
19+
}

‎benchmarks/src/main/scala/zio/redis/benchmarks/BenchmarkRuntime.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package zio.redis.benchmarks
1818

19-
import zio.internal.Platform
2019
import cats.effect.{IO => CIO}
21-
import zio.{BootstrapRuntime, Has, ZIO, ZLayer}
20+
import zio.internal.Platform
2221
import zio.logging.Logging
2322
import zio.redis._
2423
import zio.redis.codec.StringUtf8Codec
2524
import zio.schema.codec.Codec
25+
import zio.{BootstrapRuntime, Has, ZIO, ZLayer}
2626

2727
trait BenchmarkRuntime extends BootstrapRuntime {
2828
override val platform: Platform = Platform.benchmark

‎benchmarks/src/main/scala/zio/redis/benchmarks/QueryRunner.scala

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package zio.redis.benchmarks
22

3-
import cats.effect.{IO => CIO, Resource}
43
import cats.effect.unsafe.implicits.global
4+
import cats.effect.{IO => CIO, Resource}
55
import com.comcast.ip4s._
6-
import dev.profunktor.redis4cats.RedisCommands
6+
import dev.profunktor.redis4cats.codecs.Codecs
7+
import dev.profunktor.redis4cats.codecs.splits._
78
import dev.profunktor.redis4cats.data.RedisCodec
9+
import dev.profunktor.redis4cats.effect.Log.NoOp.instance
10+
import dev.profunktor.redis4cats.{Redis, RedisCommands}
811
import fs2.io.net.Network
912
import io.chrisdavenport.rediculous.RedisConnection
1013
import io.lettuce.core.ClientOptions
11-
import laserdisc.fs2.RedisClient
1214
import laserdisc.auto.autoRefine
13-
import dev.profunktor.redis4cats.Redis
14-
import dev.profunktor.redis4cats.effect.Log.NoOp.instance
15-
import dev.profunktor.redis4cats.codecs.Codecs
16-
import dev.profunktor.redis4cats.codecs.splits._
15+
import laserdisc.fs2.RedisClient
1716

1817
trait QueryRunner[Client] {
1918
def unsafeRunWith(query: Client => CIO[Unit]): Unit

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HDelBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HExistsBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HGetAllBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HGetBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HIncrbyBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HIncrbyFloatBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HKeysBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HLenBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HMGetBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HMSetBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HSetBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HSetNxBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HStrLenBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/hash/HValsBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.hash
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/lists/BlMoveBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package zio.redis.benchmarks.lists
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.duration._
2522
import zio.redis._
2623
import zio.redis.benchmarks._
2724

25+
import java.util.concurrent.TimeUnit
26+
2827
@State(Scope.Thread)
2928
@BenchmarkMode(Array(Mode.Throughput))
3029
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/lists/BlPopBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package zio.redis.benchmarks.lists
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.duration._
2522
import zio.redis._
2623
import zio.redis.benchmarks._
2724

25+
import java.util.concurrent.TimeUnit
26+
2827
@State(Scope.Thread)
2928
@BenchmarkMode(Array(Mode.Throughput))
3029
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/lists/BrPopBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package zio.redis.benchmarks.lists
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.duration._
2522
import zio.redis._
2623
import zio.redis.benchmarks._
2724

25+
import java.util.concurrent.TimeUnit
26+
2827
@State(Scope.Thread)
2928
@BenchmarkMode(Array(Mode.Throughput))
3029
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/lists/BrPopLPushBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package zio.redis.benchmarks.lists
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.duration._
2522
import zio.redis._
2623
import zio.redis.benchmarks._
2724

25+
import java.util.concurrent.TimeUnit
26+
2827
@State(Scope.Thread)
2928
@BenchmarkMode(Array(Mode.Throughput))
3029
@OutputTimeUnit(TimeUnit.SECONDS)

‎benchmarks/src/main/scala/zio/redis/benchmarks/lists/LIndexBenchmarks.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package zio.redis.benchmarks.lists
1818

19-
import java.util.concurrent.TimeUnit
20-
2119
import org.openjdk.jmh.annotations._
22-
2320
import zio.ZIO
2421
import zio.redis._
2522
import zio.redis.benchmarks._
2623

24+
import java.util.concurrent.TimeUnit
25+
2726
@State(Scope.Thread)
2827
@BenchmarkMode(Array(Mode.Throughput))
2928
@OutputTimeUnit(TimeUnit.SECONDS)

0 commit comments

Comments
 (0)