diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 16:35:20 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 16:35:20 -0700 |
| commit | a23c7e295e0c36998ef84ca5247fc5a948d29af9 (patch) | |
| tree | 634f8e7c5118bd44147cd034d761f7cfe11f43c4 /test/files | |
| parent | 16ca3899d1a99e52952a395480e8a8f5960d14d5 (diff) | |
| parent | f81a4f92967a2dd69784864e9ab9e1624d7db35b (diff) | |
| download | scala-a23c7e295e0c36998ef84ca5247fc5a948d29af9.tar.gz scala-a23c7e295e0c36998ef84ca5247fc5a948d29af9.tar.bz2 scala-a23c7e295e0c36998ef84ca5247fc5a948d29af9.zip | |
Merge 2.10.x into master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Implicits.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/pos/t7486.scala | 8 | ||||
| -rw-r--r-- | test/files/run/t6989/JavaClass_1.java | 2 | ||||
| -rw-r--r-- | test/files/run/t7359.check | 1 | ||||
| -rw-r--r-- | test/files/run/t7359/Cyclic_1.java | 3 | ||||
| -rw-r--r-- | test/files/run/t7359/Test_2.scala | 6 |
5 files changed, 20 insertions, 0 deletions
diff --git a/test/files/pos/t7486.scala b/test/files/pos/t7486.scala new file mode 100644 index 0000000000..6dd7f4c4ac --- /dev/null +++ b/test/files/pos/t7486.scala @@ -0,0 +1,8 @@ +object Test{ + var locker = 0 + // remove implicit, or change to `locker = locker + 1` to make it compile. + implicit val davyJones0 = { + locker += 0 + 0 + } +} diff --git a/test/files/run/t6989/JavaClass_1.java b/test/files/run/t6989/JavaClass_1.java index eb26a08700..72ec4d6ab6 100644 --- a/test/files/run/t6989/JavaClass_1.java +++ b/test/files/run/t6989/JavaClass_1.java @@ -7,6 +7,8 @@ package foo; // I'm leaving the incorrect results of FromJavaClassCompleters in the check // file, so that we get notified when something changes there. +// ^^^ It's not clear what those incorrect results were, but the fix for SI-7359 +// (backport of fix for SI-6548) has probably resolved some of these. OP, please revisit this comment. class PackagePrivateJavaClass { private int privateField = 0; diff --git a/test/files/run/t7359.check b/test/files/run/t7359.check new file mode 100644 index 0000000000..9766475a41 --- /dev/null +++ b/test/files/run/t7359.check @@ -0,0 +1 @@ +ok diff --git a/test/files/run/t7359/Cyclic_1.java b/test/files/run/t7359/Cyclic_1.java new file mode 100644 index 0000000000..42b46c1aed --- /dev/null +++ b/test/files/run/t7359/Cyclic_1.java @@ -0,0 +1,3 @@ +abstract class Cyclic { + static interface Inner<T extends Inner> { } +}
\ No newline at end of file diff --git a/test/files/run/t7359/Test_2.scala b/test/files/run/t7359/Test_2.scala new file mode 100644 index 0000000000..bb6f4cb2d9 --- /dev/null +++ b/test/files/run/t7359/Test_2.scala @@ -0,0 +1,6 @@ +import scala.reflect.runtime.universe._ + +object Test extends App { + typeOf[Cyclic].members + println("ok") +}
\ No newline at end of file |