diff options
author | Martin Odersky <odersky@gmail.com> | 2012-02-06 14:31:45 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2012-02-06 14:31:45 +0100 |
commit | 6a6cd3ac2986c6036e64cb38b9e22f9416409f48 (patch) | |
tree | 6283db1827b3fcca6eeecd2443f96d39a62d99dc /test/files/run | |
parent | 4407cdb4df86de2422c242210a96b11c2d14ac31 (diff) | |
download | scala-6a6cd3ac2986c6036e64cb38b9e22f9416409f48.tar.gz scala-6a6cd3ac2986c6036e64cb38b9e22f9416409f48.tar.bz2 scala-6a6cd3ac2986c6036e64cb38b9e22f9416409f48.zip |
Removing AnyVal as a source class. Removing automatic addition of ScalaObject. Undoing wrong fix in ExtensionMethods.
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/primitive-sigs-2.check | 2 | ||||
-rw-r--r-- | test/files/run/repl-parens.check | 2 | ||||
-rw-r--r-- | test/files/run/t4172.check | 2 | ||||
-rw-r--r-- | test/files/run/t4891.check | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/test/files/run/primitive-sigs-2.check b/test/files/run/primitive-sigs-2.check index c69d1b54a6..feb0619525 100644 --- a/test/files/run/primitive-sigs-2.check +++ b/test/files/run/primitive-sigs-2.check @@ -1,4 +1,4 @@ -T<java.lang.Object> interface scala.ScalaObject +T<java.lang.Object> List(A, char, class java.lang.Object) a public <T> java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.Manifest<T>) diff --git a/test/files/run/repl-parens.check b/test/files/run/repl-parens.check index 944846541f..69f0a9ce30 100644 --- a/test/files/run/repl-parens.check +++ b/test/files/run/repl-parens.check @@ -66,7 +66,7 @@ scala> 55 ; () => 5 res13: () => Int = <function0> scala> () => { class X ; new X } -res14: () => Object with ScalaObject = <function0> +res14: () => Object = <function0> scala> diff --git a/test/files/run/t4172.check b/test/files/run/t4172.check index 95e3eb950d..da467e27ea 100644 --- a/test/files/run/t4172.check +++ b/test/files/run/t4172.check @@ -4,7 +4,7 @@ Type :help for more information. scala> scala> val c = { class C { override def toString = "C" }; ((new C, new C { def f = 2 })) } -c: (C, C{def f: Int}) forSome { type C <: Object with ScalaObject } = (C,C) +c: (C, C{def f: Int}) forSome { type C <: Object } = (C,C) scala> diff --git a/test/files/run/t4891.check b/test/files/run/t4891.check index 072f8df8d4..79fd7f6fbb 100644 --- a/test/files/run/t4891.check +++ b/test/files/run/t4891.check @@ -5,4 +5,3 @@ test.generic.C1 test.generic.C2 (m) public void test.generic.C1.m1() null -interface scala.ScalaObject |