diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 10:00:30 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 10:08:36 -0700 |
| commit | 3ab383ae01a66208df4955bf2117dd2ea8eb2afe (patch) | |
| tree | ac83e7e89310955ccbc317f57f34165f9781117c /test/files/buildmanager | |
| parent | b6dde2b6cf5f66e96fc92c09c1fbe3b4a8dc348c (diff) | |
| parent | 5dca64cefeed4bc3289e641949b103e5e806aa32 (diff) | |
| download | scala-3ab383ae01a66208df4955bf2117dd2ea8eb2afe.tar.gz scala-3ab383ae01a66208df4955bf2117dd2ea8eb2afe.tar.bz2 scala-3ab383ae01a66208df4955bf2117dd2ea8eb2afe.zip | |
Merge branch 'master' 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/Importers.scala
src/compiler/scala/reflect/internal/Symbols.scala
src/compiler/scala/reflect/internal/Trees.scala
src/compiler/scala/reflect/internal/Types.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/transform/Erasure.scala
src/compiler/scala/tools/nsc/transform/LiftCode.scala
src/compiler/scala/tools/nsc/transform/UnCurry.scala
src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
test/files/run/programmatic-main.check
test/files/speclib/instrumented.jar.desired.sha1
Diffstat (limited to 'test/files/buildmanager')
| -rw-r--r-- | test/files/buildmanager/t2652/A.scala | 3 | ||||
| -rw-r--r-- | test/files/buildmanager/t2652/B.scala | 4 | ||||
| -rw-r--r-- | test/files/buildmanager/t2652/t2652.changes/A2.scala | 4 | ||||
| -rw-r--r-- | test/files/buildmanager/t2652/t2652.check | 9 | ||||
| -rw-r--r-- | test/files/buildmanager/t2652/t2652.test | 3 |
5 files changed, 0 insertions, 23 deletions
diff --git a/test/files/buildmanager/t2652/A.scala b/test/files/buildmanager/t2652/A.scala deleted file mode 100644 index a62506e890..0000000000 --- a/test/files/buildmanager/t2652/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -class A { - def x[T](t: T) = t -} diff --git a/test/files/buildmanager/t2652/B.scala b/test/files/buildmanager/t2652/B.scala deleted file mode 100644 index 86d08f0d3d..0000000000 --- a/test/files/buildmanager/t2652/B.scala +++ /dev/null @@ -1,4 +0,0 @@ -object B { - val y = (new A).x(3) -} - diff --git a/test/files/buildmanager/t2652/t2652.changes/A2.scala b/test/files/buildmanager/t2652/t2652.changes/A2.scala deleted file mode 100644 index 29135c0e94..0000000000 --- a/test/files/buildmanager/t2652/t2652.changes/A2.scala +++ /dev/null @@ -1,4 +0,0 @@ -class A { - def x[@specialized T](t: T) = t -} - diff --git a/test/files/buildmanager/t2652/t2652.check b/test/files/buildmanager/t2652/t2652.check deleted file mode 100644 index 071281c6ff..0000000000 --- a/test/files/buildmanager/t2652/t2652.check +++ /dev/null @@ -1,9 +0,0 @@ -builder > A.scala B.scala -compiling Set(A.scala, B.scala) -Changes: Map() -builder > A.scala -compiling Set(A.scala) -Changes: Map(class A -> List(Added(Definition(A.x$mBc$sp)), Added(Definition(A.x$mCc$sp)), Added(Definition(A.x$mDc$sp)), Added(Definition(A.x$mFc$sp)), Added(Definition(A.x$mIc$sp)), Added(Definition(A.x$mJc$sp)), Added(Definition(A.x$mSc$sp)), Added(Definition(A.x$mVc$sp)), Added(Definition(A.x$mZc$sp)), Changed(Definition(A.x))[method x changed from [T](t: T)T to [T](t: T)T flags: <method> <triedcooking>])) -invalidate B.scala because it references changed definition [Changed(Definition(A.x))[method x changed from [T](t: T)T to [T](t: T)T flags: <method> <triedcooking>]] -compiling Set(B.scala) -Changes: Map(object B -> List()) diff --git a/test/files/buildmanager/t2652/t2652.test b/test/files/buildmanager/t2652/t2652.test deleted file mode 100644 index 6f3bd03361..0000000000 --- a/test/files/buildmanager/t2652/t2652.test +++ /dev/null @@ -1,3 +0,0 @@ ->>compile A.scala B.scala ->>update A.scala=>A2.scala ->>compile A.scala |