Rescues @deprecated{Inheritance, Overriding}

While they ought to be generalized to aribirary modifier
changes before being offered in the standard library, the
opportunity to use them in 2.10 is too important to pass up.

So for now, they're private[scala].

En route:

 - made the error messages more concise
 - fix positioning of inheritance error
 - improve test coverage

1 files changed, 2 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index 919250c562..b9ff04c9df 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -512,10 +512,8 @@ abstract class RefChecks extends InfoTransform with reflect.internal.transform.R
         
         def checkOverrideDeprecated() {
           if (other.hasDeprecatedOverridingAnnotation) {
-            val msg = 
-              member.toString + member.locationString + " overrides " + other.toString + other.locationString + 
-              ", but overriding this member is deprecated" + 
-              other.deprecatedOverridingMessage.map(": " + _).getOrElse(".")
+            val suffix = other.deprecatedOverridingMessage map (": " + _) getOrElse ""
+            val msg = s"overriding ${other.fullLocationString} is deprecated$suffix"
             unit.deprecationWarning(member.pos, msg)
           }
         }