diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-04-15 11:38:30 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-04-15 11:38:30 +0200 |
| commit | 65719d3646e5092befa48de88f221b04dee20211 (patch) | |
| tree | 4f0394c7de5b633ca8aed6cbf40313c686f79ea5 /test/files/pos | |
| parent | f6323d866f3b9a6fa9a5d0218a47922115974781 (diff) | |
| parent | 4525e9223a2fb7c1ec3014073566b559e5839805 (diff) | |
| download | scala-65719d3646e5092befa48de88f221b04dee20211.tar.gz scala-65719d3646e5092befa48de88f221b04dee20211.tar.bz2 scala-65719d3646e5092befa48de88f221b04dee20211.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/v2.10.1-235-g4525e92-to-master
Conflicts:
bincompat-backward.whitelist.conf
bincompat-forward.whitelist.conf
src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/reflect/scala/reflect/internal/Types.scala
Diffstat (limited to 'test/files/pos')
| -rwxr-xr-x | test/files/pos/spec-t6286.scala | 10 | ||||
| -rw-r--r-- | test/files/pos/t6386.scala | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/test/files/pos/spec-t6286.scala b/test/files/pos/spec-t6286.scala new file mode 100755 index 0000000000..4d87998ec6 --- /dev/null +++ b/test/files/pos/spec-t6286.scala @@ -0,0 +1,10 @@ +trait Foo[@specialized(Int) A] { + def fun[@specialized(Int) B](init: B)(f: (B, A) => B): B +} + +class Bar(values: Array[Int]) extends Foo[Int] { + def fun[@specialized(Int) C](init: C)(f: (C, Int) => C): C = { + val arr = values + f(init, arr(0)) + } +} diff --git a/test/files/pos/t6386.scala b/test/files/pos/t6386.scala new file mode 100644 index 0000000000..85098a78f0 --- /dev/null +++ b/test/files/pos/t6386.scala @@ -0,0 +1,5 @@ +import scala.reflect.runtime.universe._ + +object Test extends App { + reify(manifest[Some[_]]) +}
\ No newline at end of file |