Deprecate procedure syntax unconditionally

Procedure syntax was deprecated under -Xfuture flag in scala#3076.
This deprecates it unconditionally, and drops it under -Xsource:2.14.

See scala/bug#7605

Author: eed3si9n

src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

@@ -2727,18 +2727,20 @@ self =>
         val vparamss = paramClauses(name, contextBoundBuf.toList, ofCaseClass = false)
         newLineOptWhenFollowedBy(LBRACE)
         var restype = fromWithinReturnType(typedOpt())
+        def msg(what: String, instead: String) =
+          s"procedure syntax is $what: instead, add `$instead` to explicitly declare `$name`'s return type"
         val rhs =
           if (isStatSep || in.token == RBRACE) {
             if (restype.isEmpty) {
-              if (settings.future)
-                deprecationWarning(in.lastOffset, s"Procedure syntax is deprecated. Convert procedure `$name` to method by adding `: Unit`.", "2.12.0")
+              if (settings.isScala214) syntaxError(in.lastOffset, msg("unsupported", ": Unit"))
+              else deprecationWarning(in.lastOffset, msg("deprecated", ": Unit"), "2.13.0")
               restype = scalaUnitConstr
             }
             newmods |= Flags.DEFERRED
             EmptyTree
           } else if (restype.isEmpty && in.token == LBRACE) {
-            if (settings.future)
-              deprecationWarning(in.offset, s"Procedure syntax is deprecated. Convert procedure `$name` to method by adding `: Unit =`.", "2.12.0")
+            if (settings.isScala214) syntaxError(in.offset, msg("unsupported", ": Unit ="))
+            else deprecationWarning(in.offset, msg("deprecated", ": Unit ="), "2.13.0")
             restype = scalaUnitConstr
             blockExpr()
           } else {

test/files/neg/macro-deprecate-idents.check

@@ -49,6 +49,9 @@ macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as a
 macro-deprecate-idents.scala:55: error: macro is now a reserved word; usage as an identifier is disallowed
   def macro = 2
       ^
+macro-deprecate-idents.scala:55: warning: procedure syntax is deprecated: instead, add `: Unit` to explicitly declare `<error>`'s return type
+  def macro = 2
+               ^
 macro-deprecate-idents.scala:3: error: '=' expected but '}' found.
 }
 ^
@@ -64,4 +67,5 @@ macro-deprecate-idents.scala:45: error: '{' expected but '}' found.
 macro-deprecate-idents.scala:52: error: ')' expected but '}' found.
 }
 ^
+one warning found
 22 errors found

test/files/neg/procedure-deprecation.check

@@ -0,0 +1,15 @@
+procedure-deprecation.scala:2: warning: procedure syntax is deprecated: instead, add `: Unit =` to explicitly declare `bar`'s return type
+  def bar {}
+          ^
+procedure-deprecation.scala:3: warning: procedure syntax is deprecated: instead, add `: Unit` to explicitly declare `baz`'s return type
+  def baz
+         ^
+procedure-deprecation.scala:4: warning: procedure syntax is deprecated: instead, add `: Unit` to explicitly declare `boo`'s return type
+  def boo(i: Int, l: Long)
+                          ^
+procedure-deprecation.scala:5: warning: procedure syntax is deprecated: instead, add `: Unit =` to explicitly declare `boz`'s return type
+  def boz(i: Int, l: Long) {}
+                           ^
+error: No warnings can be incurred under -Xfatal-warnings.
+four warnings found
+one error found

test/files/neg/procedure-deprecation.flags

@@ -0,0 +1 @@
+-deprecation -Xfatal-warnings

test/files/neg/t7605-deprecation.scala renamed to test/files/neg/procedure-deprecation.scala

@@ -0,0 +1,13 @@
+procedure-removal.scala:2: error: procedure syntax is unsupported: instead, add `: Unit =` to explicitly declare `bar`'s return type
+  def bar {}
+          ^
+procedure-removal.scala:3: error: procedure syntax is unsupported: instead, add `: Unit` to explicitly declare `baz`'s return type
+  def baz
+         ^
+procedure-removal.scala:4: error: procedure syntax is unsupported: instead, add `: Unit` to explicitly declare `boo`'s return type
+  def boo(i: Int, l: Long)
+                          ^
+procedure-removal.scala:5: error: procedure syntax is unsupported: instead, add `: Unit =` to explicitly declare `boz`'s return type
+  def boz(i: Int, l: Long) {}
+                           ^
+four errors found

test/files/neg/procedure-removal.check

@@ -0,0 +1 @@
+-Xsource:2.14

test/files/neg/procedure-removal.flags

@@ -0,0 +1,8 @@
+abstract class Foo {
+  def bar {}
+  def baz
+  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!
+}