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, 3 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index df97e451d1..3913c4f815 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1578,12 +1578,9 @@ trait Typers extends Modes with Adaptations with Tags {
             pending += ParentFinalInheritanceError(parent, psym)
 
           if (psym.hasDeprecatedInheritanceAnnotation) {
-            val sym = selfType.typeSymbol
-            val msg = 
-              sym.toString + sym.locationString + " inherits from " + psym.toString + psym.locationString + 
-              ", but inheriting from that class is deprecated" + 
-              psym.deprecatedInheritanceMessage.map(": " + _).getOrElse(".")
-            unit.deprecationWarning(sym.pos, msg)
+            val suffix = psym.deprecatedInheritanceMessage map (": " + _) getOrElse ""
+            val msg = s"inheritance from ${psym.fullLocationString} is deprecated$suffix"
+            unit.deprecationWarning(parent.pos, msg)
           }
 
           if (psym.isSealed && !phase.erasedTypes)