summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon Ochsenreither <simon@ochsenreither.de>2013-11-14 17:23:48 +0100
committerSimon Ochsenreither <simon@ochsenreither.de>2013-11-14 17:28:57 +0100
commitbc98d7d5aaeeced69751688b57a69297a528fd3b (patch)
treed78854dae99435b7282c3068ab7e9a25151c33b3 /test
parent946b76ad8b31b1fd74e2f8e1972c4a9159ac690a (diff)
downloadscala-bc98d7d5aaeeced69751688b57a69297a528fd3b.tar.gz
scala-bc98d7d5aaeeced69751688b57a69297a528fd3b.tar.bz2
scala-bc98d7d5aaeeced69751688b57a69297a528fd3b.zip
SI-7961 Fix false positive procedure warnings
Two issues are fixed in this commit: - `def foo: Unit` was detected as missing a return type - The warning was emitted for constructors, but `def this(...): Unit = ...` is not valid Scala syntax
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t7605-deprecation.check15
-rw-r--r--test/files/neg/t7605-deprecation.scala7
2 files changed, 14 insertions, 8 deletions
diff --git a/test/files/neg/t7605-deprecation.check b/test/files/neg/t7605-deprecation.check
index 9c466c058c..6db94613a1 100644
--- a/test/files/neg/t7605-deprecation.check
+++ b/test/files/neg/t7605-deprecation.check
@@ -1,12 +1,15 @@
-t7605-deprecation.scala:2: warning: Procedure syntax is deprecated. Convert procedure to method by adding `: Unit =`.
- def this(i: Int) { this() }
- ^
-t7605-deprecation.scala:3: warning: Procedure syntax is deprecated. Convert procedure to method by adding `: Unit =`.
+t7605-deprecation.scala:2: warning: Procedure syntax is deprecated. Convert procedure `bar` to method by adding `: Unit =`.
def bar {}
^
-t7605-deprecation.scala:4: warning: Procedure syntax is deprecated. Convert procedure to method by adding `: Unit`.
+t7605-deprecation.scala:3: warning: Procedure syntax is deprecated. Convert procedure `baz` to method by adding `: Unit`.
def baz
^
+t7605-deprecation.scala:4: warning: Procedure syntax is deprecated. Convert procedure `boo` to method by adding `: Unit`.
+ def boo(i: Int, l: Long)
+ ^
+t7605-deprecation.scala:5: warning: Procedure syntax is deprecated. Convert procedure `boz` to method by adding `: Unit =`.
+ def boz(i: Int, l: Long) {}
+ ^
error: No warnings can be incurred under -Xfatal-warnings.
-three warnings found
+four warnings found
one error found
diff --git a/test/files/neg/t7605-deprecation.scala b/test/files/neg/t7605-deprecation.scala
index 4a7dcd26d6..2b3362f94a 100644
--- a/test/files/neg/t7605-deprecation.scala
+++ b/test/files/neg/t7605-deprecation.scala
@@ -1,5 +1,8 @@
abstract class Foo {
- def this(i: Int) { this() }
def bar {}
def baz
-} \ No newline at end of file
+ def boo(i: Int, l: Long)
+ def boz(i: Int, l: Long) {}
+ def this(i: Int) { this() } // Don't complain here!
+ def foz: Unit // Don't complain here!
+}