diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-03 23:32:26 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-03 23:32:26 -0800 |
| commit | f482d5bdd0722e54cb3cfc2219df93da5f435bac (patch) | |
| tree | 75649efafadabd20d2bb68c931e24c0ccc9303b0 /test/files/pos | |
| parent | 2cf6c5d7e5cfbd60958eac0a545f5c2978a8e5cd (diff) | |
| parent | 33e32179fd6dcf06554b817f54b97ac5a6e052ab (diff) | |
| download | scala-f482d5bdd0722e54cb3cfc2219df93da5f435bac.tar.gz scala-f482d5bdd0722e54cb3cfc2219df93da5f435bac.tar.bz2 scala-f482d5bdd0722e54cb3cfc2219df93da5f435bac.zip | |
Merge 2.10.1 into 2.10.x
The fix for SI-7183 in 440bf0a8c2 was forward ported in f73d50f46c.
Conflicts:
src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
Diffstat (limited to 'test/files/pos')
| -rw-r--r-- | test/files/pos/t7126.scala | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/files/pos/t7126.scala b/test/files/pos/t7126.scala new file mode 100644 index 0000000000..6720511e08 --- /dev/null +++ b/test/files/pos/t7126.scala @@ -0,0 +1,11 @@ +import language._ + +object Test { + type T = Any + boom(???): Option[T] // SOE + def boom[CC[U]](t : CC[T]): Option[CC[T]] = None + + // okay + foo(???): Option[Any] + def foo[CC[U]](t : CC[Any]): Option[CC[Any]] = None +}
\ No newline at end of file |