Merge pull request #10092 from SethTisue/include-type-in-value-discar…

…d-message in -Wvalue-discard message, include type of discarded value
scala · Jul 28, 2022 · 52e7c0f · 52e7c0f
2 parents e616e1d + fcd9886
commit 52e7c0f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1117,7 +1117,9 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
               case (Apply(Select(receiver, _), _), SingleType(_, sym)) => sym == receiver.symbol
               case _ => false
             }
-            if (!isThisTypeResult && !explicitlyUnit(tree)) context.warning(tree.pos, "discarded non-Unit value", WarningCategory.WFlagValueDiscard)
+            if (!isThisTypeResult && !explicitlyUnit(tree))
+              context.warning(tree.pos, s"discarded non-Unit value of type ${tree.tpe}",
+                WarningCategory.WFlagValueDiscard)
           }
           @inline def warnNumericWiden(tpSym: Symbol, ptSym: Symbol): Unit =
             if (!isPastTyper) {

diff --git a/test/files/neg/t12026.check b/test/files/neg/t12026.check
@@ -1,4 +1,4 @@
-t12026.scala:11: warning: discarded non-Unit value
+t12026.scala:11: warning: discarded non-Unit value of type Int
   def f(): Unit = v()
                    ^
 error: No warnings can be incurred under -Werror.

diff --git a/test/files/neg/t9847.check b/test/files/neg/t9847.check
@@ -1,13 +1,13 @@
-t9847.scala:6: warning: discarded non-Unit value
+t9847.scala:6: warning: discarded non-Unit value of type Int(42)
   def f(): Unit = 42
                   ^
-t9847.scala:14: warning: discarded non-Unit value
+t9847.scala:14: warning: discarded non-Unit value of type Int(1)
   + 1
   ^
-t9847.scala:18: warning: discarded non-Unit value
+t9847.scala:18: warning: discarded non-Unit value of type Int
     x + 1
       ^
-t9847.scala:21: warning: discarded non-Unit value
+t9847.scala:21: warning: discarded non-Unit value of type Int
   def j(): Unit = x + 1
                     ^
 t9847.scala:6: warning: a pure expression does nothing in statement position

diff --git a/test/files/neg/value-discard.check b/test/files/neg/value-discard.check
@@ -1,7 +1,7 @@
-value-discard.scala:6: warning: discarded non-Unit value
+value-discard.scala:6: warning: discarded non-Unit value of type Boolean
     mutable.Set[String]().remove("")   // expected to warn
                                 ^
-value-discard.scala:13: warning: discarded non-Unit value
+value-discard.scala:13: warning: discarded non-Unit value of type scala.collection.mutable.Set[String]
   def subtract(): Unit = mutable.Set.empty[String].subtractOne("")     // warn
                                                               ^
 value-discard.scala:17: warning: a pure expression does nothing in statement position; multiline expressions might require enclosing parentheses