diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-04-02 13:16:09 +0200 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-04-02 13:16:09 +0200 |
| commit | de3bd754676fbed0b6c69ca3d676b72bc276e925 (patch) | |
| tree | 1d18a7f8c193fda503d63d286ddcf561842d1091 /test/files/neg/t1364.check | |
| parent | c14766c1affe968788c77fea45ae042d71038472 (diff) | |
| parent | f7535f72903f083b2444fb1d0b73363efa5482e9 (diff) | |
| download | scala-de3bd754676fbed0b6c69ca3d676b72bc276e925.tar.gz scala-de3bd754676fbed0b6c69ca3d676b72bc276e925.tar.bz2 scala-de3bd754676fbed0b6c69ca3d676b72bc276e925.zip | |
Merge branch 'master' into feature/collection-concurrent
Conflicts:
src/library/scala/collection/JavaConversions.scala
src/library/scala/collection/JavaConverters.scala
Add one test for concurrent map conversion.
Diffstat (limited to 'test/files/neg/t1364.check')
| -rw-r--r-- | test/files/neg/t1364.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t1364.check b/test/files/neg/t1364.check index 78375333c2..cb8803abdc 100644 --- a/test/files/neg/t1364.check +++ b/test/files/neg/t1364.check @@ -1,4 +1,4 @@ -t1364.scala:9: error: overriding type T in trait A with bounds >: Nothing <: AnyRef{type S[-U]}; +t1364.scala:9: error: overriding type T in trait A with bounds <: AnyRef{type S[-U]}; type T has incompatible type type T = { type S[U] = U } ^ |