SI-6388 Remove first parts of deprecated @serializable annotation

3 files changed, 1 insertions, 41 deletions

diff --git a/test/files/run/t3038d.scala b/test/files/run/t3038d.scala
index 6cd2d83776..9550165235 100644
--- a/test/files/run/t3038d.scala
+++ b/test/files/run/t3038d.scala
@@ -16,9 +16,7 @@ trait Foo {
   }
 }
 
-
-@serializable
-class Bar extends Foo {
+class Bar extends Foo with Serializable {
   @transient protected var first: Any = null
   def size = a
   @transient var second: Any = null
diff --git a/test/files/run/t3667.check b/test/files/run/t3667.check
index bbe5d1bc48..6375c88997 100644
--- a/test/files/run/t3667.check
+++ b/test/files/run/t3667.check
@@ -1,6 +1,3 @@
-1
-2
-3
 4
 2
 3
diff --git a/test/files/run/t3667.scala b/test/files/run/t3667.scala
index f30d57ce3a..ada09d5886 100644
--- a/test/files/run/t3667.scala
+++ b/test/files/run/t3667.scala
@@ -1,27 +1,9 @@
 object Test {
   def main(args: Array[String]) {
-    val o1 = new Outer1
-    val o2 = new Outer2
-    val o3 = new Outer3
     val o4 = new Outer4
     val o5 = new Outer5
     val o6 = new Outer6
 
-    println(1)
-    ser(new o1.Inner(1))
-    o1.Inner // make sure the Inner$module field of the Outer1 instance is initialized!
-    ser(new o1.Inner(1))
-
-    println(2)
-    ser(new o2.Inner(1))
-    o2.Inner
-    ser(new o2.Inner(1))
-
-    println(3)
-    ser(new o3.Inner(1))
-    o3.Inner
-    ser(new o3.Inner(1))
-
     println(4)
     ser(new o4.Inner(1))
     o4.Inner
@@ -54,23 +36,6 @@ object Test {
 
 }
 
-@serializable
-class Outer1 {
-  @serializable
-  class Inner(x: Int = 1)
-}
-
-@serializable
-class Outer2 {
-  case class Inner(x: Int = 1)
-}
-
-@serializable
-class Outer3 {
-  case class Inner(x: Int)
-}
-
-
 class Outer4 extends Serializable {
   class Inner(x: Int = 1) extends Serializable
 }