Merge pull request #738 from japgolly/topic/nowarn

Fix #735: New Reusability.derive emits warnings with -Wunused:nowarn

Author: japgolly

core/src/main/scala/japgolly/scalajs/react/internal/ReusabilityMacros.scala

@@ -93,7 +93,7 @@ class ReusabilityMacros(val c: Context) extends MacroUtils {
       val typ = weakTypeOf[A]
       val ra = ReusabilityA(typ)
       val prep = init1.varDef(ra, q"new Reusability(null)")
-      lazies += q"""@_root_.scala.annotation.nowarn("cat=unused") implicit lazy val ${TermName("_" + prep.decodedName)}: $ra = $Reusability.byName($prep)"""
+      lazies += q"""implicit lazy val ${TermName("_" + prep.decodedName)}: $ra = $Reusability.byName($prep)"""
       lazy val completed: c.Expr[Reusability[A]] = {
         val inner = complete
         val impl = q"$prep = $inner"

core/src/main/scala/japgolly/scalajs/react/raw/Profiler.scala

@@ -6,11 +6,10 @@ import scala.scalajs.js.annotation.JSGlobal
 import scalajs.js
 
 @js.native
-@nowarn("cat=unused")
 trait Interaction extends js.Object {
-  val __count   : Int    = js.native
-  val id        : Int    = js.native
-  val name      : String = js.native
+  val __count  : Int    = js.native
+  val id       : Int    = js.native
+  val name     : String = js.native
   val timestamp: Double  = js.native
 }
 

core/src/main/scala/japgolly/scalajs/react/raw/events.scala

@@ -7,7 +7,6 @@ import scala.scalajs.js.annotation.JSName
 
 /** https://facebook.github.io/react/docs/events.html */
 @js.native
-@nowarn("cat=unused")
 trait SyntheticEvent[+DOMEventTarget <: dom.Node] extends js.Object {
   val bubbles         : Boolean        = js.native
   val cancelable      : Boolean        = js.native

doc/changelog/1.7.2.md

@@ -0,0 +1,3 @@
+# 1.7.2
+
+* Fix: no longer generate warnings when `-Wunused:nowarn` is enabled

monocle-scalaz/src/main/scala/japgolly/scalajs/react/internal/MonocleExtStateSnapshot.scala

@@ -22,12 +22,12 @@ trait MonocleExtStateSnapshot {
 
 object MonocleExtStateSnapshot {
 
-  final class ObjectWithoutReuse(@nowarn("cat=unused") private val ε: StateSnapshot.type) extends AnyVal {
+  final class ObjectWithoutReuse(private val ε: StateSnapshot.type) extends AnyVal {
     def zoomL[S, T](lens: monocle.Lens[S, T]) =
       StateSnapshot.zoom(lens.get)(lens.set)
   }
 
-  final class ObjectWithReuse(@nowarn("cat=unused") private val ε: StateSnapshot.withReuse.type) extends AnyVal {
+  final class ObjectWithReuse(private val ε: StateSnapshot.withReuse.type) extends AnyVal {
     def zoomL[S, T](lens: monocle.Lens[S, T]) =
       StateSnapshot.withReuse.zoom(lens.get)(lens.set)
   }
@@ -61,7 +61,6 @@ object MonocleExtStateSnapshot {
       self.zoomStateOption(o.getOption)(o.set)
   }
 
-  @nowarn("cat=unused")
   final class InstanceWithReuse[A](private val self: StateSnapshot.InstanceMethodsWithReuse[A]) extends AnyVal {
 
     @deprecated("This ability doesn't work. See https://github.com/japgolly/scalajs-react/issues/721 for an explanation, and https://japgolly.github.io/scalajs-react/#examples/state-snapshot-2 for the alternative.", "1.7.1")

monocle/src/main/scala/japgolly/scalajs/react/internal/MonocleExtStateSnapshot.scala

@@ -22,12 +22,12 @@ trait MonocleExtStateSnapshot {
 
 object MonocleExtStateSnapshot {
 
-  final class ObjectWithoutReuse(@nowarn("cat=unused") private val ε: StateSnapshot.type) extends AnyVal {
+  final class ObjectWithoutReuse(private val ε: StateSnapshot.type) extends AnyVal {
     def zoomL[S, T](lens: monocle.Lens[S, T]) =
       StateSnapshot.zoom(lens.get)(lens.set)
   }
 
-  final class ObjectWithReuse(@nowarn("cat=unused") private val ε: StateSnapshot.withReuse.type) extends AnyVal {
+  final class ObjectWithReuse(private val ε: StateSnapshot.withReuse.type) extends AnyVal {
     def zoomL[S, T](lens: monocle.Lens[S, T]) =
       StateSnapshot.withReuse.zoom(lens.get)(lens.set)
   }
@@ -54,7 +54,6 @@ object MonocleExtStateSnapshot {
     self.zoomState(lens.get)(lens.set)
   }
 
-  @nowarn("cat=unused")
   final class InstanceWithReuse[A](private val self: StateSnapshot.InstanceMethodsWithReuse[A]) extends AnyVal {
 
     @deprecated("This ability doesn't work. See https://github.com/japgolly/scalajs-react/issues/721 for an explanation, and https://japgolly.github.io/scalajs-react/#examples/state-snapshot-2 for the alternative.", "1.7.1")

project/Build.scala

@@ -65,6 +65,7 @@ object ScalajsReact {
     "-Wunused:implicits",                            // Warn if an implicit parameter is unused.
     "-Wunused:imports",                              // Warn if an import selector is not referenced.
     "-Wunused:locals",                               // Warn if a local definition is unused.
+    "-Wunused:nowarn",                               // Warn if a @nowarn annotation does not suppress any warnings.
     "-Wunused:patvars",                              // Warn if a variable bound in a pattern is unused.
     "-Wunused:privates",                             // Warn if a private member is unused.
     "-Xlint:adapted-args",                           // An argument list was modified to match the receiver.

test/src/test/scala/japgolly/scalajs/react/core/RefTest.scala

@@ -241,7 +241,7 @@ object RefTest extends TestSuite {
       def withRef() = {
         class Backend {
           val ref = Ref.toScalaComponent(InnerScala)
-          @nowarn def render = Forwarder.withRef(ref)("noice")
+          def render = Forwarder.withRef(ref)("noice")
         }
         val C = ScalaComponent.builder[Unit]("X").renderBackend[Backend].build
         ReactTestUtils.withNewBodyElement { mountNode =>
@@ -254,7 +254,7 @@ object RefTest extends TestSuite {
       def withRef2() = {
         class Backend {
           val ref = Ref.toScalaComponent[Int, Unit, InnerScalaBackend]
-          @nowarn def render = Forwarder.withRef(ref)("noice")
+          def render = Forwarder.withRef(ref)("noice")
         }
         val C = ScalaComponent.builder[Unit]("X").renderBackend[Backend].build
         ReactTestUtils.withNewBodyElement { mountNode =>
@@ -267,7 +267,7 @@ object RefTest extends TestSuite {
       def mappedRef() = {
         class Backend {
           val ref = Ref.toScalaComponent(InnerScala).map(_.backend.gimmeHtmlNow())
-          @nowarn def render = Forwarder.withRef(ref)("noice")
+          def render = Forwarder.withRef(ref)("noice")
         }
         val C = ScalaComponent.builder[Unit]("X").renderBackend[Backend].build
         ReactTestUtils.withNewBodyElement { mountNode =>

test/src/test/scala/japgolly/scalajs/react/core/ReusabilityTest.scala

@@ -81,15 +81,15 @@ object ReusabilityTest extends TestSuite {
       final case class Suite[+Z](bms: Vector[BM[Z]]) extends Item[Z]
       final case class Blah1[+B](blah: Option[Blah1[B]]) extends Item[B]
       final case class Blah2[+C](blah: Option[Blah2[C]], i: Int) extends Item[C]
+      final case class Blah3(i: Int) extends Item[Nothing]
 
       final case class BM[+W](value: W)
 
       implicit def reusabilityBM[A: Reusability]: Reusability[BM[A]] =
         Reusability.derive
 
-      implicit def reusability[H: Reusability]: Reusability[Item[H]] = {
+      implicit def reusability[H: Reusability]: Reusability[Item[H]] =
         Reusability.derive
-      }
     }
   }