Merge pull request #108 from razvan-panda/master

Fix "pattern var x in method equals is never used" warning in generated code

library/src/main/scala/sbt/contraband/ScalaCodeGen.scala

@@ -211,17 +211,16 @@ class ScalaCodeGen(javaLazy: String, javaOptional: String, instantiateJavaOption
 
   private def genEquals(cl: RecordLikeDefinition) = {
     val allFields = cl.fields filter { _.arguments.isEmpty }
-    val comparisonCode =
-      if (allFields exists (_.fieldType.isLazyType)) {
-        "super.equals(o) // We have lazy members, so use object identity to avoid circularity."
-      } else if (allFields.isEmpty) {
-        "true"
-      } else {
-        allFields map (f => s"(this.${bq(f.name)} == x.${bq(f.name)})") mkString " && "
-      }
+    val (x, comparisonCode) =
+      if (allFields exists (_.fieldType.isLazyType))
+        ("_", "super.equals(o) // We have lazy members, so use object identity to avoid circularity.")
+      else if (allFields.isEmpty)
+        ("_", "true")
+      else
+        ("x", allFields map (f => s"(this.${bq(f.name)} == x.${bq(f.name)})") mkString " && ")
 
     s"""override def equals(o: Any): Boolean = o match {
-       |  case x: ${cl.name} => $comparisonCode
+       |  case $x: ${cl.name} => $comparisonCode
        |  case _ => false
        |}""".stripMargin
   }

library/src/test/scala/JsonScalaCodeGenSpec.scala

@@ -109,7 +109,7 @@ class JsonScalaCodeGenSpec extends GCodeGenSpec("Scala") {
       """/** example of nested protocols */
         |sealed abstract class nestedProtocolExample() extends Serializable {
         |  override def equals(o: Any): Boolean = o match {
-        |    case x: nestedProtocolExample => true
+        |    case _: nestedProtocolExample => true
         |    case _ => false
         |  }
         |  override def hashCode: Int = {
@@ -124,7 +124,7 @@ class JsonScalaCodeGenSpec extends GCodeGenSpec("Scala") {
         |
         |sealed abstract class nestedProtocol() extends nestedProtocolExample() with Serializable {
         |  override def equals(o: Any): Boolean = o match {
-        |    case x: nestedProtocol => true
+        |    case _: nestedProtocol => true
         |    case _ => false
         |  }
         |  override def hashCode: Int = {
@@ -140,7 +140,7 @@ class JsonScalaCodeGenSpec extends GCodeGenSpec("Scala") {
         |
         |final class ChildRecord private () extends nestedProtocol() with Serializable {
         |  override def equals(o: Any): Boolean = o match {
-        |    case x: ChildRecord => true
+        |    case _: ChildRecord => true
         |    case _ => false
         |  }
         |  override def hashCode: Int = {
@@ -353,7 +353,7 @@ object primitiveTypesExample2 {
         |  lazy val lazyArrayInteger: Vector[Int] = _lazyArrayInteger
         |  lazy val lazyOptionInteger: Option[Int] = _lazyOptionInteger
         |  override def equals(o: Any): Boolean = o match {
-        |    case x: primitiveTypesExample => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
+        |    case _: primitiveTypesExample => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
         |    case _ => false
         |  }
         |  override def hashCode: Int = {

library/src/test/scala/JsonSchemaExample.scala

@@ -429,7 +429,7 @@ sealed abstract class Greetings(
   lazy val message: String = _message
 
   override def equals(o: Any): Boolean = o match {
-    case x: Greetings => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
+    case _: Greetings => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
     case _ => false
   }
   override def hashCode: Int = {
@@ -450,7 +450,7 @@ final class SimpleGreeting private (
   private def this(message: => String) = this(message, new com.example.GreetingHeader(new java.util.Date(), "Unknown"))
 
   override def equals(o: Any): Boolean = o match {
-    case x: SimpleGreeting => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
+    case _: SimpleGreeting => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
     case _ => false
   }
   override def hashCode: Int = {
@@ -482,7 +482,7 @@ sealed abstract class GreetingExtra(
 
 
   override def equals(o: Any): Boolean = o match {
-    case x: GreetingExtra => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
+    case _: GreetingExtra => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
     case _ => false
   }
   override def hashCode: Int = {
@@ -503,7 +503,7 @@ final class GreetingExtraImpl private (
   private def this(message: com.example.Lazy[String], extra: Array[String], x: String) = this(message, new com.example.GreetingHeader(new java.util.Date(), "Unknown"), extra, x)
 
   override def equals(o: Any): Boolean = o match {
-    case x: GreetingExtraImpl => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
+    case _: GreetingExtraImpl => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
     case _ => false
   }
   override def hashCode: Int = {
@@ -542,7 +542,7 @@ final class GreetingWithAttachments private (
   private def this(message: => String, attachments: Vector[java.io.File]) = this(message, new com.example.GreetingHeader(new java.util.Date(), "Unknown"), attachments)
 
   override def equals(o: Any): Boolean = o match {
-    case x: GreetingWithAttachments => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
+    case _: GreetingWithAttachments => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
     case _ => false
   }
   override def hashCode: Int = {
@@ -580,7 +580,7 @@ final class GreetingHeader private (
   /** Creation date */
   lazy val created: java.util.Date = _created
   override def equals(o: Any): Boolean = o match {
-    case x: GreetingHeader => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
+    case _: GreetingHeader => super.equals(o) // We have lazy members, so use object identity to avoid circularity.
     case _ => false
   }
   override def hashCode: Int = {