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, 16 insertions, 1 deletions

diff --git a/test/files/neg/t6162-inheritance.scala b/test/files/neg/t6162-inheritance.scala
index 67bd4466c3..7b47b9285a 100644
--- a/test/files/neg/t6162-inheritance.scala
+++ b/test/files/neg/t6162-inheritance.scala
@@ -1,4 +1,19 @@
+package scala.t6126
+
 @deprecatedInheritance("`Foo` will be made final in a future version.", "2.10.0")
 class Foo
 
-class SubFoo extends Foo
\ No newline at end of file
+class SubFoo extends Foo
+
+@deprecatedInheritance()
+trait T
+
+object SubT extends T
+
+@deprecatedInheritance()
+trait S
+
+object O {
+  new S {
+  }
+}