scalafix-remove-imports

lihaoyi · lihaoyi · commit c46d7bfc81c8 · 2023-12-10T22:36:06.000-08:00
diff --git a/build.sc b/build.sc
@@ -27,7 +27,7 @@ trait Common extends CrossScalaModule with PublishModule with ScalafixModule{
     )
   )
 
-  def scalacOptions = Seq("-Wunused")
+  def scalacOptions = Seq("-Wunused:imports")
 }
 
 
@@ -45,7 +45,7 @@ trait ScalaSql extends Common{
 
 
   object test extends ScalaTests with ScalafixModule{
-    def scalacOptions = Seq("-Wunused")
+    def scalacOptions = Seq("-Wunused:imports")
     def ivyDeps = Agg(
       ivy"com.github.vertical-blank:sql-formatter:2.0.4",
       ivy"com.lihaoyi::mainargs:0.4.0",
diff --git a/scalasql/core/src/DbApi.scala b/scalasql/core/src/DbApi.scala
@@ -2,7 +2,7 @@ package scalasql.core
 
 import geny.Generator
 
-import java.sql.{PreparedStatement, ResultSet, Statement}
+import java.sql.{PreparedStatement, Statement}
 
 /**
  * An interface to the SQL database allowing you to run queries.
diff --git a/scalasql/operations/src/ExprAggOps.scala b/scalasql/operations/src/ExprAggOps.scala
@@ -1,8 +1,7 @@
 package scalasql.operations
 
 import scalasql.core.Aggregatable
-import scalasql.core.SqlStr.SqlStringSyntax
-import scalasql.core.{Queryable, TypeMapper, Expr}
+import scalasql.core.{TypeMapper, Expr}
 
 abstract class ExprAggOps[T](v: Aggregatable[Expr[T]]) {
 
diff --git a/scalasql/operations/src/MathOps.scala b/scalasql/operations/src/MathOps.scala
@@ -1,6 +1,6 @@
 package scalasql.operations
 import scalasql.core.SqlStr.SqlStringSyntax
-import scalasql.core.{Expr, SqlStr}
+import scalasql.core.Expr
 
 trait MathOps {
 
diff --git a/scalasql/query/src/Aggregate.scala b/scalasql/query/src/Aggregate.scala
@@ -1,6 +1,6 @@
 package scalasql.query
 
-import scalasql.core.{Queryable, Expr, SqlStr, TypeMapper, Context}
+import scalasql.core.{Queryable, SqlStr, Context}
 
 class Aggregate[Q, R](
     toSqlStr0: Context => SqlStr,
diff --git a/scalasql/query/src/CompoundSelect.scala b/scalasql/query/src/CompoundSelect.scala
@@ -1,17 +1,7 @@
 package scalasql.query
 
 import scalasql.core.SqlStr.{Renderable, SqlStringSyntax}
-import scalasql.renderer.JoinsToSql
-import scalasql.core.{
-  Context,
-  DialectTypeMappers,
-  LiveExprs,
-  Queryable,
-  Expr,
-  SqlStr,
-  TypeMapper,
-  WithSqlExpr
-}
+import scalasql.core.{Context, DialectTypeMappers, LiveExprs, Queryable, Expr, SqlStr}
 
 /**
  * A SQL `SELECT` query, with
diff --git a/scalasql/query/src/From.scala b/scalasql/query/src/From.scala
@@ -1,6 +1,6 @@
 package scalasql.query
 
-import scalasql.core.{Context, Expr, ExprsToSql, LiveExprs, Queryable, SqlStr, WithSqlExpr}
+import scalasql.core.{Context, Expr, ExprsToSql, LiveExprs, Queryable, SqlStr}
 import scalasql.core.Context.From
 import scalasql.core.SqlStr.SqlStringSyntax
 
diff --git a/scalasql/query/src/Insert.scala b/scalasql/query/src/Insert.scala
@@ -1,6 +1,6 @@
 package scalasql.query
 
-import scalasql.core.{DialectTypeMappers, Queryable, Expr, SqlStr, WithSqlExpr}
+import scalasql.core.{DialectTypeMappers, Queryable, Expr, WithSqlExpr}
 
 /**
  * A SQL `INSERT` query
diff --git a/scalasql/query/src/InsertValues.scala b/scalasql/query/src/InsertValues.scala
@@ -1,7 +1,7 @@
 package scalasql.query
 
 import scalasql.core.{Context, DialectTypeMappers, Queryable, SqlStr, WithSqlExpr}
-import scalasql.core.SqlStr.{Renderable, SqlStringSyntax}
+import scalasql.core.SqlStr.SqlStringSyntax
 
 trait InsertValues[V[_[_]], R] extends Query.ExecuteUpdate[Int] {
   def skipColumns(x: (V[Column] => Column[_])*): InsertValues[V, R]
diff --git a/scalasql/query/src/JoinOps.scala b/scalasql/query/src/JoinOps.scala
@@ -1,6 +1,6 @@
 package scalasql.query
 
-import scalasql.core.{Queryable, Expr, WithSqlExpr}
+import scalasql.core.{Expr, WithSqlExpr}
 
 trait JoinOps[C[_, _], Q, R] extends WithSqlExpr[Q] {
 
diff --git a/scalasql/query/src/Joinable.scala b/scalasql/query/src/Joinable.scala
@@ -1,6 +1,6 @@
 package scalasql.query
 
-import scalasql.core.{Context, Expr, JoinNullable, WithSqlExpr}
+import scalasql.core.{Context, Expr, JoinNullable}
 
 /**
  * Something that can be joined; typically a [[Select]] or a [[Table]]
diff --git a/scalasql/query/src/JoinsToSql.scala b/scalasql/query/src/JoinsToSql.scala
@@ -1,8 +1,8 @@
 package scalasql.renderer
 
-import scalasql.core.{Context, LiveExprs, Queryable, Expr, SqlStr, TypeMapper}
+import scalasql.core.{Context, LiveExprs, SqlStr}
 import scalasql.core.SqlStr.SqlStringSyntax
-import scalasql.query.{AscDesc, CompoundSelect, Join, Joinable, Nulls, Select, SimpleSelect}
+import scalasql.query.Join
 
 object JoinsToSql {
 
diff --git a/scalasql/query/src/Returning.scala b/scalasql/query/src/Returning.scala
@@ -1,8 +1,7 @@
 package scalasql.query
 
 import scalasql.core.SqlStr.{Renderable, SqlStringSyntax}
-import scalasql.core.{Context, ExprsToSql, Queryable, SqlStr, TypeMapper, WithSqlExpr}
-import scalasql.renderer.JoinsToSql
+import scalasql.core.{Context, ExprsToSql, Queryable, SqlStr, WithSqlExpr}
 
 /**
  * A query with a `RETURNING` clause
diff --git a/scalasql/query/src/SimpleSelect.scala b/scalasql/query/src/SimpleSelect.scala
@@ -1,7 +1,6 @@
 package scalasql.query
 
 import scalasql.core.{
-  Config,
   Context,
   DialectTypeMappers,
   JoinNullable,
@@ -10,15 +9,11 @@ import scalasql.core.{
   Expr,
   ExprsToSql,
   SqlStr,
-  TypeMapper,
-  WithSqlExpr
+  TypeMapper
 }
-import scalasql.renderer.JoinsToSql.joinsToSqlStr
-import scalasql.core.SqlStr.{Renderable, SqlStringSyntax, join}
+import scalasql.core.SqlStr.{Renderable, SqlStringSyntax}
 import scalasql.renderer.JoinsToSql
 
-import scala.collection.mutable
-
 /**
  * A `SELECT` query, with `FROM`/`JOIN`/`WHERE`/`GROUP BY`
  * clauses, but without `ORDER BY`/`LIMIT`/`TAKE`/`UNION` clauses
diff --git a/scalasql/query/src/Table.scala b/scalasql/query/src/Table.scala
@@ -2,8 +2,6 @@ package scalasql.query
 
 import scalasql.core.{DialectTypeMappers, Sc, Queryable, Expr}
 
-import scala.language.experimental.macros
-
 /**
  * In-code representation of a SQL table, associated with a given `case class` [[V]].
  */
diff --git a/scalasql/query/src/Update.scala b/scalasql/query/src/Update.scala
@@ -1,16 +1,6 @@
 package scalasql.query
 
-import scalasql.core.{
-  Context,
-  DialectTypeMappers,
-  LiveExprs,
-  Queryable,
-  Expr,
-  ExprsToSql,
-  SqlStr,
-  TypeMapper,
-  WithSqlExpr
-}
+import scalasql.core.{Context, DialectTypeMappers, LiveExprs, Queryable, Expr, ExprsToSql, SqlStr}
 import scalasql.core.SqlStr.{Renderable, SqlStringSyntax, optSeq}
 import scalasql.renderer.JoinsToSql
 
@@ -53,7 +43,7 @@ object Update {
   )(implicit val qr: Queryable.Row[Q, R], dialect: DialectTypeMappers)
       extends Update[Q, R] {
 
-    import dialect.{dialectSelf => _, _}
+    import dialect.{dialectSelf => _}
     protected def copy[Q, R](
         expr: Q = this.expr,
         table: TableRef = this.table,
diff --git a/scalasql/query/src/Values.scala b/scalasql/query/src/Values.scala
@@ -1,16 +1,7 @@
 package scalasql.query
 
-import scalasql.core.{
-  Context,
-  DialectTypeMappers,
-  Expr,
-  LiveExprs,
-  Queryable,
-  SqlStr,
-  TypeMapper,
-  WithSqlExpr
-}
-import scalasql.core.SqlStr.{Renderable, SqlStringSyntax}
+import scalasql.core.{Context, DialectTypeMappers, Expr, LiveExprs, Queryable, SqlStr}
+import scalasql.core.SqlStr.SqlStringSyntax
 
 /**
  * A SQL `VALUES` clause, used to treat a sequence of primitive [[T]]s as
diff --git a/scalasql/query/src/WithCte.scala b/scalasql/query/src/WithCte.scala
@@ -8,10 +8,9 @@ import scalasql.core.{
   Expr,
   ExprsToSql,
   SqlStr,
-  TypeMapper,
   WithSqlExpr
 }
-import scalasql.core.SqlStr.{Renderable, SqlStringSyntax}
+import scalasql.core.SqlStr.SqlStringSyntax
 
 /**
  * A SQL `WITH` clause
diff --git a/scalasql/src/dialects/DbApiQueryOps.scala b/scalasql/src/dialects/DbApiQueryOps.scala
@@ -1,6 +1,5 @@
 package scalasql.dialects
 
-import scalasql.core.SqlStr.SqlStringSyntax
 import scalasql.core._
 import scalasql.query.{Select, Values, WithCte, WithCteRef}
 
diff --git a/scalasql/src/dialects/Dialect.scala b/scalasql/src/dialects/Dialect.scala
@@ -1,11 +1,10 @@
 package scalasql.dialects
 
-import scalasql.operations.{CaseWhen, DbApiOps}
+import scalasql.operations.DbApiOps
 import scalasql.query.SqlWindow
-import scalasql.core.Expr.apply0
 import scalasql.{Table, operations}
 import scalasql.core.Aggregatable
-import scalasql.core.{DbApi, DialectTypeMappers, JoinNullable, Queryable, Expr, SqlStr, TypeMapper}
+import scalasql.core.{DbApi, DialectTypeMappers, JoinNullable, Queryable, Expr, TypeMapper}
 
 import java.sql.{JDBCType, PreparedStatement, ResultSet}
 import java.time.{
diff --git a/scalasql/src/dialects/H2Dialect.scala b/scalasql/src/dialects/H2Dialect.scala
@@ -1,6 +1,5 @@
 package scalasql.dialects
 
-import scalasql.dialects.MySqlDialect.CompoundSelectRenderer
 import scalasql.core.{
   Aggregatable,
   Context,
@@ -12,18 +11,8 @@ import scalasql.core.{
   SqlStr,
   TypeMapper
 }
-import scalasql.{Sc, dialects, operations}
-import scalasql.query.{
-  CompoundSelect,
-  GroupBy,
-  InsertColumns,
-  InsertSelect,
-  Join,
-  Joinable,
-  OrderBy,
-  Query,
-  Table
-}
+import scalasql.{Sc, operations}
+import scalasql.query.{CompoundSelect, GroupBy, Join, Joinable, OrderBy, Table}
 import scalasql.core.SqlStr.SqlStringSyntax
 import scalasql.operations.{
   BitwiseFunctionOps,
@@ -34,7 +23,7 @@ import scalasql.operations.{
   TrimOps
 }
 
-import java.sql.{JDBCType, PreparedStatement, ResultSet}
+import java.sql.PreparedStatement
 
 trait H2Dialect extends Dialect {
 
diff --git a/scalasql/src/dialects/MySqlDialect.scala b/scalasql/src/dialects/MySqlDialect.scala
@@ -15,8 +15,7 @@ import scalasql.query.{
   OrderBy,
   Query,
   Table,
-  TableRef,
-  Update
+  TableRef
 }
 import scalasql.core.{
   Aggregatable,
@@ -32,10 +31,10 @@ import scalasql.core.{
   WithSqlExpr
 }
 import scalasql.core.SqlStr.{Renderable, SqlStringSyntax, optSeq}
-import scalasql.operations.{ConcatOps, ExprNumericOps, MathOps, PadOps}
+import scalasql.operations.{ConcatOps, MathOps, PadOps}
 import scalasql.renderer.JoinsToSql
 
-import java.sql.{JDBCType, PreparedStatement, ResultSet}
+import java.sql.PreparedStatement
 import java.time.{Instant, LocalDateTime}
 import java.util.UUID
 import scala.reflect.ClassTag
diff --git a/scalasql/src/dialects/SqliteDialect.scala b/scalasql/src/dialects/SqliteDialect.scala
@@ -10,10 +10,10 @@ import scalasql.core.{
   SqlStr,
   TypeMapper
 }
-import scalasql.{Sc, dialects, operations}
-import scalasql.query.{AscDesc, CompoundSelect, GroupBy, Join, Nulls, OrderBy, Select, Table}
+import scalasql.{Sc, operations}
+import scalasql.query.{CompoundSelect, GroupBy, Join, OrderBy, Table}
 import scalasql.core.SqlStr.SqlStringSyntax
-import scalasql.operations.{DbApiOps, TrimOps}
+import scalasql.operations.TrimOps
 
 import java.time.{Instant, LocalDate, LocalDateTime}
 
diff --git a/scalasql/src/dialects/TableOps.scala b/scalasql/src/dialects/TableOps.scala
@@ -1,24 +1,14 @@
 package scalasql.dialects
 
 import scalasql.dialects.Dialect
-import scalasql.core.{Expr, WithSqlExpr}
+import scalasql.core.Expr
 import scalasql.Sc
-import scalasql.query.{
-  Column,
-  Delete,
-  Insert,
-  Joinable,
-  Select,
-  SimpleSelect,
-  SubqueryRef,
-  Table,
-  Update
-}
+import scalasql.query.{Column, Delete, Insert, Joinable, Select, SimpleSelect, Table, Update}
 
 class TableOps[V[_[_]]](val t: Table[V])(implicit dialect: Dialect)
     extends Joinable[V[Expr], V[Sc]] {
 
-  import dialect.{dialectSelf => _, _}
+  import dialect.{dialectSelf => _}
 
   protected def toFromExpr0 = {
     val ref = Table.ref(t)
diff --git a/scalasql/test/src/UnitTestData.scala b/scalasql/test/src/UnitTestData.scala
@@ -1,16 +1,7 @@
 package scalasql
 import scalasql._
 
-import java.sql.Date
-import java.time.{
-  Instant,
-  LocalDate,
-  LocalDateTime,
-  LocalTime,
-  OffsetDateTime,
-  OffsetTime,
-  ZonedDateTime
-}
+import java.time.LocalDate
 
 case class Product[T[_]](id: T[Int], kebabCaseName: T[String], name: T[String], price: T[Double])
 object Product extends Table[Product]
diff --git a/scalasql/test/src/WorldSqlTests.scala b/scalasql/test/src/WorldSqlTests.scala
@@ -1,7 +1,4 @@
 package test.scalasql
-import scalasql.query.{AscDesc, CompoundSelect, Nulls, OrderBy}
-import scalasql.core.Context
-import scalasql.SqlStr
 import utest._
 
 import java.sql.{JDBCType, PreparedStatement, ResultSet}
diff --git a/scalasql/test/src/api/DbApiTests.scala b/scalasql/test/src/api/DbApiTests.scala
@@ -8,7 +8,6 @@ import sourcecode.Text
 import utest._
 
 import java.time.LocalDate
-import scala.collection.mutable
 
 trait DbApiTests extends ScalaSqlSuite {
   def description = "Basic usage of `db.*` operations such as `db.run`"
diff --git a/scalasql/test/src/datatypes/DataTypesTests.scala b/scalasql/test/src/datatypes/DataTypesTests.scala
diff --git a/scalasql/test/src/datatypes/OptionalTests.scala b/scalasql/test/src/datatypes/OptionalTests.scala
diff --git a/scalasql/test/src/dialects/MySqlDialectTests.scala b/scalasql/test/src/dialects/MySqlDialectTests.scala
diff --git a/scalasql/test/src/dialects/PostgresDialectTests.scala b/scalasql/test/src/dialects/PostgresDialectTests.scala
diff --git a/scalasql/test/src/example/CheatSheetExample.scala b/scalasql/test/src/example/CheatSheetExample.scala
diff --git a/scalasql/test/src/operations/DbApiOpsTests.scala b/scalasql/test/src/operations/DbApiOpsTests.scala
diff --git a/scalasql/test/src/query/CompoundSelectTests.scala b/scalasql/test/src/query/CompoundSelectTests.scala
diff --git a/scalasql/test/src/query/DeleteTests.scala b/scalasql/test/src/query/DeleteTests.scala
diff --git a/scalasql/test/src/query/UpdateSubQueryTests.scala b/scalasql/test/src/query/UpdateSubQueryTests.scala
diff --git a/scalasql/test/src/query/WindowFunctionTests.scala b/scalasql/test/src/query/WindowFunctionTests.scala
diff --git a/scalasql/test/src/utils/ScalaSqlSuite.scala b/scalasql/test/src/utils/ScalaSqlSuite.scala
diff --git a/scalasql/test/src/utils/TestChecker.scala b/scalasql/test/src/utils/TestChecker.scala

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ trait Common extends CrossScalaModule with PublishModule with ScalafixModule{`
`27`	`27`	`)`
`28`	`28`	`)`
`29`	`29`
`30`		`- def scalacOptions = Seq("-Wunused")`
	`30`	`+ def scalacOptions = Seq("-Wunused:imports")`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`@@ -45,7 +45,7 @@ trait ScalaSql extends Common{`
`45`	`45`
`46`	`46`
`47`	`47`	`object test extends ScalaTests with ScalafixModule{`
`48`		`- def scalacOptions = Seq("-Wunused")`
	`48`	`+ def scalacOptions = Seq("-Wunused:imports")`
`49`	`49`	`def ivyDeps = Agg(`
`50`	`50`	`ivy"com.github.vertical-blank:sql-formatter:2.0.4",`
`51`	`51`	`ivy"com.lihaoyi::mainargs:0.4.0",`