summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-03-14 13:06:06 -0700
committerPaul Phillips <paulp@improving.org>2012-03-14 13:06:06 -0700
commit1c061e5931ccc39090d955e3bc18dd0a1e48df84 (patch)
tree4e351e3c3f3efa5a8e63c3d79bcb665d21d25630 /test/files/jvm
parenta127aae2a5fbae146ea81e470541209436222970 (diff)
parent54e284d669418ebc6445bd0ec66804b9067f6dd3 (diff)
downloadscala-1c061e5931ccc39090d955e3bc18dd0a1e48df84.tar.gz
scala-1c061e5931ccc39090d955e3bc18dd0a1e48df84.tar.bz2
scala-1c061e5931ccc39090d955e3bc18dd0a1e48df84.zip
Merge remote-tracking branch 'odersky/topic/inline' into merge-inline
Conflicts: lib/scala-compiler.jar.desired.sha1 lib/scala-library-src.jar.desired.sha1 lib/scala-library.jar.desired.sha1 src/compiler/scala/reflect/internal/Definitions.scala src/compiler/scala/reflect/internal/Symbols.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/transform/Constructors.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala src/library/scala/Function0.scala src/library/scala/Function1.scala src/library/scala/Function10.scala src/library/scala/Function11.scala src/library/scala/Function12.scala src/library/scala/Function13.scala src/library/scala/Function14.scala src/library/scala/Function15.scala src/library/scala/Function16.scala src/library/scala/Function17.scala src/library/scala/Function18.scala src/library/scala/Function19.scala src/library/scala/Function2.scala src/library/scala/Function20.scala src/library/scala/Function21.scala src/library/scala/Function22.scala src/library/scala/Function3.scala src/library/scala/Function4.scala src/library/scala/Function5.scala src/library/scala/Function6.scala src/library/scala/Function7.scala src/library/scala/Function8.scala src/library/scala/Function9.scala test/files/codelib/code.jar.desired.sha1 test/files/neg/anyval-children-2.check test/files/run/programmatic-main.check
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/manifests.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/manifests.check b/test/files/jvm/manifests.check
index 453db81a3b..54f504b929 100644
--- a/test/files/jvm/manifests.check
+++ b/test/files/jvm/manifests.check
@@ -29,7 +29,7 @@ x=Foo, m=Foo[scala.collection.immutable.List[Int]]
x=Foo, m=Foo[Foo[Int]]
x=Foo, m=Foo[scala.collection.immutable.List[Foo[Int]]]
-x=Test1$$anon$1, m=Object with Bar[java.lang.String] with Object
+x=Test1$$anon$1, m=Object with Bar[java.lang.String]
()=()
true=true