diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-05-07 20:57:18 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-05-07 20:57:18 +0000 |
| commit | 08f13ccc1f78f5851760a91bdca989d2a6be82dc (patch) | |
| tree | a6886752ed0be27d3aa609c91038104eedfde7fc /test/files/neg | |
| parent | a895f35fe1692025c609b7a734e4efba856b7193 (diff) | |
| download | scala-08f13ccc1f78f5851760a91bdca989d2a6be82dc.tar.gz scala-08f13ccc1f78f5851760a91bdca989d2a6be82dc.tar.bz2 scala-08f13ccc1f78f5851760a91bdca989d2a6be82dc.zip | |
Merged revisions 24882,24886,24897,24901-24902 ...
Merged revisions 24882,24886,24897,24901-24902 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r24882 | extempore | 2011-05-04 04:55:17 +0200 (Wed, 04 May 2011) | 1 line
Fix for failing test, no review.
........
r24886 | malayeri | 2011-05-05 14:45:21 +0200 (Thu, 05 May 2011) | 1 line
[scaladoc] Unify template and package header. New icons for entities
with a companion. No review. ........ r24897 | malayeri | 2011-05-06
11:55:35 +0200 (Fri, 06 May 2011) | 1 line
[scaladoc] Fix minor CSS issue. No review.
........
r24901 | extempore | 2011-05-07 04:12:01 +0200 (Sat, 07 May 2011) | 2 lines
Made GenTraversableOnce public. (I assume that is the plan.) No
review. ........ r24902 | extempore | 2011-05-07 04:51:58 +0200 (Sat, 07
May 2011) | 2 lines
My estimation of what will fix fsc on cygwin/windows, but untested.
Review by community. ........
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/bug4533.check | 4 | ||||
| -rw-r--r-- | test/files/neg/bug4533.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/bug4533.check b/test/files/neg/bug4533.check index e1b60aa820..b405619831 100644 --- a/test/files/neg/bug4533.check +++ b/test/files/neg/bug4533.check @@ -1,4 +1,4 @@ -bug4533.scala:6: error: erroneous or inaccessible type - def statusByAlarms(alarms: GenTraversableOnce[FooAlarm]) = println("hello") +bug4533.scala:6: error: trait GenSetLike in package collection cannot be accessed in package collection + def statusByAlarms(alarms: GenSetLike[FooAlarm]) = println("hello") ^ one error found diff --git a/test/files/neg/bug4533.scala b/test/files/neg/bug4533.scala index 0346b5d1d5..425c958328 100644 --- a/test/files/neg/bug4533.scala +++ b/test/files/neg/bug4533.scala @@ -3,6 +3,6 @@ package demo import scala.collection._ class CrashDemo { - def statusByAlarms(alarms: GenTraversableOnce[FooAlarm]) = println("hello") + def statusByAlarms(alarms: GenSetLike[FooAlarm]) = println("hello") } class FooAlarm { } |