unused

Author: lihaoyi

build.sc

@@ -27,7 +27,7 @@ trait Common extends CrossScalaModule with PublishModule with ScalafixModule{
     )
   )
 
-  def scalacOptions = Seq("-Wunused:imports")
+  def scalacOptions = Seq("-Xlint:unused")
 }
 
 
@@ -45,7 +45,7 @@ trait ScalaSql extends Common{
 
 
   object test extends ScalaTests with ScalafixModule{
-    def scalacOptions = Seq("-Wunused:imports")
+    def scalacOptions = Seq("-Xlint:unused")
     def ivyDeps = Agg(
       ivy"com.github.vertical-blank:sql-formatter:2.0.4",
       ivy"com.lihaoyi::mainargs:0.4.0",

scalasql/operations/src/AggOps.scala

@@ -9,7 +9,7 @@ class AggOps[T](v: Aggregatable[T])(implicit qr: Queryable.Row[T, _], dialect: D
   import dialect._
 
   /** Counts the rows */
-  def size: Expr[Int] = v.aggregateExpr(expr => implicit ctx => sql"COUNT(1)")
+  def size: Expr[Int] = v.aggregateExpr(expr => _ => sql"COUNT(1)")
 
   /** Computes the sum of column values */
   def sumBy[V: Numeric: TypeMapper](f: T => Expr[V])(

scalasql/operations/src/DbApiOps.scala

@@ -16,37 +16,37 @@ class DbApiOps(dialect: DialectTypeMappers) {
    * with gaps. If there is no ORDER BY clause, then all rows are considered peers and
    * this function always returns 1.
    */
-  def rank(): Expr[Int] = Expr { implicit ctx => sql"RANK()" }
+  def rank(): Expr[Int] = Expr { _ => sql"RANK()" }
 
   /**
    * The number of the row within the current partition. Rows are numbered starting
    * from 1 in the order defined by the ORDER BY clause in the window definition, or
    * in arbitrary order otherwise.
    */
-  def rowNumber(): Expr[Int] = Expr { implicit ctx => sql"ROW_NUMBER()" }
+  def rowNumber(): Expr[Int] = Expr { _ => sql"ROW_NUMBER()" }
 
   /**
    * The number of the current row's peer group within its partition - the rank of the
    * current row without gaps. Rows are numbered starting from 1 in the order defined
    * by the ORDER BY clause in the window definition. If there is no ORDER BY clause,
    * then all rows are considered peers and this function always returns 1.
    */
-  def denseRank(): Expr[Int] = Expr { implicit ctx => sql"DENSE_RANK()" }
+  def denseRank(): Expr[Int] = Expr { _ => sql"DENSE_RANK()" }
 
   /**
    * Despite the name, this function always returns a value between 0.0 and 1.0 equal to
    * (rank - 1)/(partition-rows - 1), where rank is the value returned by built-in window
    * function rank() and partition-rows is the total number of rows in the partition. If
    * the partition contains only one row, this function returns 0.0.
    */
-  def percentRank(): Expr[Double] = Expr { implicit ctx => sql"PERCENT_RANK()" }
+  def percentRank(): Expr[Double] = Expr { _ => sql"PERCENT_RANK()" }
 
   /**
    * The cumulative distribution. Calculated as row-number/partition-rows, where row-number
    * is the value returned by row_number() for the last peer in the group and partition-rows
    * the number of rows in the partition.
    */
-  def cumeDist(): Expr[Double] = Expr { implicit ctx => sql"CUME_DIST()" }
+  def cumeDist(): Expr[Double] = Expr { _ => sql"CUME_DIST()" }
 
   /**
    * Argument N is handled as an integer. This function divides the partition into N groups
@@ -55,7 +55,7 @@ class DbApiOps(dialect: DialectTypeMappers) {
    * groups occur first. This function returns the integer value assigned to the group that
    * the current row is a part of.
    */
-  def ntile(n: Int): Expr[Int] = Expr { implicit ctx => sql"NTILE($n)" }
+  def ntile(n: Int): Expr[Int] = Expr { _ => sql"NTILE($n)" }
 
   private def lagLead[T](prefix: SqlStr, e: Expr[T], offset: Int, default: Expr[T]): Expr[T] =
     Expr { implicit ctx =>

scalasql/operations/src/ExprOptionOps.scala

@@ -35,6 +35,6 @@ class ExprOptionOps[T: TypeMapper](v: Expr[Option[T]])(implicit dialect: Dialect
 
   def filter(other: Expr[T] => Expr[Boolean]): Expr[Option[T]] = new CaseWhen.Else[Option[T]](
     Seq(other(Expr[T] { implicit ctx: Context => sql"$v" }) -> v),
-    Expr { implicit ctx => sql"NULL" }
+    Expr { _ => sql"NULL" }
   )
 }

scalasql/operations/src/MathOps.scala

@@ -56,6 +56,6 @@ trait MathOps {
   }
 
   /** Returns the value of Pi */
-  def pi: Expr[Double] = Expr { implicit ctx => sql"PI()" }
+  def pi: Expr[Double] = Expr { _ => sql"PI()" }
 
 }

scalasql/src/dialects/MySqlDialect.scala

@@ -126,7 +126,7 @@ object MySqlDialect extends MySqlDialect {
     /**
      * Returns a random value in the range 0.0 <= x < 1.0
      */
-    def rand: Expr[Double] = Expr { implicit ctx => sql"RAND()" }
+    def rand: Expr[Double] = Expr { _ => sql"RAND()" }
   }
 
   class ExprAggOps[T](v: Aggregatable[Expr[T]]) extends scalasql.operations.ExprAggOps[T](v) {

scalasql/src/dialects/PostgresDialect.scala

@@ -76,7 +76,7 @@ object PostgresDialect extends PostgresDialect {
     /**
      * Returns a random value in the range 0.0 <= x < 1.0
      */
-    def random: Expr[Double] = Expr { implicit ctx => sql"RANDOM()" }
+    def random: Expr[Double] = Expr { _ => sql"RANDOM()" }
   }
 
   class ExprAggOps[T](v: Aggregatable[Expr[T]]) extends scalasql.operations.ExprAggOps[T](v) {

scalasql/src/dialects/SqliteDialect.scala

@@ -59,15 +59,15 @@ object SqliteDialect extends SqliteDialect {
      * changes() SQL function is a wrapper around the sqlite3_changes64() C/C++
      * function and hence follows the same rules for counting changes.
      */
-    def changes: Expr[Int] = Expr { implicit ctx => sql"CHANGES()" }
+    def changes: Expr[Int] = Expr { _ => sql"CHANGES()" }
 
     /**
      * The total_changes() function returns the number of row changes caused by
      * INSERT, UPDATE or DELETE statements since the current database connection
      * was opened. This function is a wrapper around the sqlite3_total_changes64()
      * C/C++ interface.
      */
-    def totalChanges: Expr[Int] = Expr { implicit ctx => sql"TOTAL_CHANGES()" }
+    def totalChanges: Expr[Int] = Expr { _ => sql"TOTAL_CHANGES()" }
 
     /**
      * The typeof(X) function returns a string that indicates the datatype of the
@@ -81,13 +81,13 @@ object SqliteDialect extends SqliteDialect {
      * last_insert_rowid() SQL function is a wrapper around the
      * sqlite3_last_insert_rowid() C/C++ interface function.
      */
-    def lastInsertRowId: Expr[Int] = Expr { implicit ctx => sql"LAST_INSERT_ROWID()" }
+    def lastInsertRowId: Expr[Int] = Expr { _ => sql"LAST_INSERT_ROWID()" }
 
     /**
      * The random() function returns a pseudo-random integer between
      * -9223372036854775808 and +9223372036854775807.
      */
-    def random: Expr[Long] = Expr { implicit ctx => sql"RANDOM()" }
+    def random: Expr[Long] = Expr { _ => sql"RANDOM()" }
 
     /**
      * The randomblob(N) function return an N-byte blob containing pseudo-random bytes.

scalasql/test/src/FailureTests.scala

@@ -3,6 +3,8 @@ import scalasql.core.Expr
 import utest._
 import utils.SqliteSuite
 
+import scala.annotation.unused
+
 /**
  * Tests for all the aggregate operators that we provide by default
  */
@@ -21,7 +23,7 @@ object FailureTests extends SqliteSuite {
       val ex = intercept[Exception] { Expr(1).toString }
       assert(ex.getMessage.contains("Expr#toString is not defined"))
 
-      val s: String = Expr.toString(Expr(1))
+      @unused val s: String = Expr.toString(Expr(1))
     }
 
   }

scalasql/test/src/WorldSqlTests.scala

@@ -1330,7 +1330,7 @@ object WorldSqlTests extends TestSuite {
         // is rolled back and all changes are undoned (as seen below)
         dbClient.transaction { implicit db =>
           try {
-            db.savepoint { implicit sp =>
+            db.savepoint { _ =>
               db.run(City.delete(_.countryCode === "SGP"))
 
               db.run(City.select.filter(_.countryCode === "SGP")) ==> Seq()