Un-deprecate some shadowing inner classes in compiler

NthPortal · Oct 23, 2020 · b04ea78 · b04ea78
1 parent 0343756
commit b04ea78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala
@@ -173,8 +173,9 @@ trait Trees extends scala.reflect.internal.Trees { self: Global =>
   @nowarn("""cat=deprecation&origin=scala\.tools\.nsc\.ast\.Trees\.Transformer""")
   final type AstTransformer = Transformer
 
+  // TODO: deprecate when we can cleanly cross-compile without warnings
+  // @deprecated("use AstTransformer instead", since = "2.13.4")
   @nowarn("msg=shadowing a nested class of a parent is deprecated")
-  @deprecated("use AstTransformer instead", since = "2.13.4")
   class Transformer extends InternalTransformer {
     def transformUnit(unit: CompilationUnit): Unit = {
       try unit.body = transform(unit.body)

diff --git a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
@@ -28,8 +28,9 @@ abstract class OverridingPairs extends SymbolPairs {
   @nowarn("""cat=deprecation&origin=scala\.tools\.nsc\.transform\.OverridingPairs\.Cursor""")
   final type PairsCursor = Cursor
 
+  // TODO: deprecate when we can cleanly cross-compile without warnings
+  // @deprecated("use PairsCursor instead", since = "2.13.4")
   @nowarn("msg=shadowing a nested class of a parent is deprecated")
-  @deprecated("use PairsCursor instead", since = "2.13.4")
   class Cursor(base: Symbol) extends super.Cursor(base) {
     /** Symbols to exclude: Here these are constructors and private/artifact symbols,
      *  including bridges. But it may be refined in subclasses.