Encapsulate deprecation warning message synthesis.

Both refchecks and typer constructed the same message. But different.
Now with more DRYness.

Note that no check files had to be updated (disconcerting)...

1 files changed, 5 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/Reporting.scala b/src/compiler/scala/tools/nsc/Reporting.scala
index 9a20807145..bc27afb0c5 100644
--- a/src/compiler/scala/tools/nsc/Reporting.scala
+++ b/src/compiler/scala/tools/nsc/Reporting.scala
@@ -15,7 +15,7 @@ import scala.collection.{ mutable, immutable }
  *
  * TODO: make reporting configurable
  */
-trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions with CompilationUnits with scala.reflect.api.Symbols =>
+trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions with CompilationUnits with scala.reflect.internal.Symbols =>
   def settings: Settings
 
   // not deprecated yet, but a method called "error" imported into
@@ -65,6 +65,10 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w
 
     // behold! the symbol that caused the deprecation warning (may not be deprecated itself)
     def deprecationWarning(pos: Position, sym: Symbol, msg: String): Unit = _deprecationWarnings.warn(pos, msg)
+    def deprecationWarning(pos: Position, sym: Symbol): Unit = {
+      val suffix = sym.deprecationMessage match { case Some(msg) => ": "+ msg case _ => "" }
+      deprecationWarning(pos, sym, s"$sym${sym.locationString} is deprecated$suffix")
+    }
 
     private[this] var reportedFeature = Set[Symbol]()
     def featureWarning(pos: Position, featureName: String, featureDesc: String, featureTrait: Symbol, construct: => String = "", required: Boolean): Unit = {