diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-18 11:27:59 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-18 11:27:59 -0800 |
| commit | e8cf90221190a8642bd3f27b9f1f2b7b0c22eee6 (patch) | |
| tree | 0851f7ca85d30993e314b2311111ec5bf8fa50d0 | |
| parent | e6a8b64c5c6015f2b1c49d4e8bba00ceb9c6fbd8 (diff) | |
| parent | 5412766a834fa730865628a57c767f36eb1b4dc4 (diff) | |
| download | scala-e8cf90221190a8642bd3f27b9f1f2b7b0c22eee6.tar.gz scala-e8cf90221190a8642bd3f27b9f1f2b7b0c22eee6.tar.bz2 scala-e8cf90221190a8642bd3f27b9f1f2b7b0c22eee6.zip | |
Merge pull request #4309 from som-snytt/issue/9116-b
SI-9116 Set.subsets has a param list
| -rw-r--r-- | src/library/scala/collection/SetLike.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t9116.scala | 7 | ||||
| -rw-r--r-- | test/files/run/settings-parse.scala | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/library/scala/collection/SetLike.scala b/src/library/scala/collection/SetLike.scala index c98ab6ecb1..f8ac1d754d 100644 --- a/src/library/scala/collection/SetLike.scala +++ b/src/library/scala/collection/SetLike.scala @@ -185,7 +185,7 @@ self => * * @return the iterator. */ - def subsets: Iterator[This] = new AbstractIterator[This] { + def subsets(): Iterator[This] = new AbstractIterator[This] { private val elms = self.toIndexedSeq private var len = 0 private var itr: Iterator[This] = Iterator.empty diff --git a/test/files/pos/t9116.scala b/test/files/pos/t9116.scala new file mode 100644 index 0000000000..16b04c2e6b --- /dev/null +++ b/test/files/pos/t9116.scala @@ -0,0 +1,7 @@ + +trait X { + List(1, 2, 3).toSet.subsets.map(_.toList) // ok now + + List(1, 2, 3).toSet.subsets().map(_.toList) // now also + List(1, 2, 3).toSet.subsets(2).map(_.toList) // still ok +} diff --git a/test/files/run/settings-parse.scala b/test/files/run/settings-parse.scala index 2754feb972..8d83caf68f 100644 --- a/test/files/run/settings-parse.scala +++ b/test/files/run/settings-parse.scala @@ -3,9 +3,8 @@ import scala.language.postfixOps import scala.tools.nsc._ object Test { - val tokens = List("", "-deprecation", "foo.scala") - val subsets = tokens.toSet.subsets.toList - val permutations0 = subsets.flatMap(_.toList.permutations).distinct + val tokens = "" :: "-deprecation" :: "foo.scala" :: Nil + val permutations0 = tokens.toSet.subsets.flatMap(_.toList.permutations).toList.distinct def runWithCp(cp: String) = { val permutations = permutations0 flatMap ("-cp CPTOKEN" :: _ permutations) |