diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-06 10:40:06 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-06 11:14:53 -0800 |
| commit | f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c (patch) | |
| tree | dd7a0e76b3b2ea26ba25b7acfd6436ce6fbd5263 /test/files/run | |
| parent | b6dde2b6cf5f66e96fc92c09c1fbe3b4a8dc348c (diff) | |
| parent | 5376ded8acfb9552b2da6c558c5b0db73df99075 (diff) | |
| download | scala-f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c.tar.gz scala-f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c.tar.bz2 scala-f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c.zip | |
Merge remote-tracking branch 'odersky/topic/inline' into inline-remerge
Conflicts:
src/compiler/scala/reflect/internal/Definitions.scala
src/compiler/scala/tools/nsc/typechecker/Namers.scala
src/library/scala/AnyVal.scala
test/files/run/primitive-sigs-2.check
test/files/run/t4172.check
test/files/scalap/abstractClass/result.test
test/files/scalap/abstractMethod/result.test
test/files/scalap/caseClass/result.test
test/files/scalap/cbnParam/result.test
test/files/scalap/classPrivate/result.test
test/files/scalap/classWithExistential/result.test
test/files/scalap/classWithSelfAnnotation/result.test
test/files/scalap/covariantParam/result.test
test/files/scalap/implicitParam/result.test
test/files/scalap/paramClauses/result.test
test/files/scalap/paramNames/result.test
test/files/scalap/sequenceParam/result.test
test/files/scalap/simpleClass/result.test
test/files/scalap/traitObject/result.test
test/files/scalap/typeAnnotations/result.test
test/files/scalap/valAndVar/result.test
test/files/scalap/wildcardType/result.test
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/primitive-sigs-2.check | 2 | ||||
| -rw-r--r-- | test/files/run/t4110.check | 4 | ||||
| -rw-r--r-- | test/files/run/t4172.check | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/primitive-sigs-2.check b/test/files/run/primitive-sigs-2.check index 0af1434cea..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> class java.lang.Object +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/t4110.check b/test/files/run/t4110.check index dea7e5957c..8b005989de 100644 --- a/test/files/run/t4110.check +++ b/test/files/run/t4110.check @@ -1,2 +1,2 @@ -Object with Test$A with Test$B with Object -Object with Test$A with Test$B with Object +Object with Test$A with Test$B +Object with Test$A with Test$B diff --git a/test/files/run/t4172.check b/test/files/run/t4172.check index b94da0c9d8..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 with Object{def f: Int}) forSome { type C <: Object } = (C,C) +c: (C, C{def f: Int}) forSome { type C <: Object } = (C,C) scala> |