Skip to content

Commit 659b966

Browse files
committed
iterator() -> iterator
1 parent 4722690 commit 659b966

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: scala
33
scala:
44
- 2.11.12
55
- 2.12.6
6-
- 2.13.0-pre-abf21b9
6+
- 2.13.0-pre-a002630
77
jdk:
88
- oraclejdk8
99
env:
@@ -21,9 +21,9 @@ env:
2121

2222
matrix:
2323
exclude:
24-
- scala: 2.13.0-pre-abf21b9
24+
- scala: 2.13.0-pre-a002630
2525
env: SCALAJS_VERSION=0.6.22
26-
- scala: 2.13.0-pre-abf21b9
26+
- scala: 2.13.0-pre-a002630
2727
env: SCALAJS_VERSION=1.0.0-M3
2828
include:
2929
- scala: 2.12.6

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ the strawman:
2020

2121
~~~ diff
2222
- xs.toIterator
23-
+ xs.iterator()
23+
+ xs.iterator
2424
~~~
2525

2626
### Add a missing test case
@@ -45,7 +45,7 @@ class toIteratorVsIterator(xs: Iterable[Int]) {
4545
import strawman.collection.Iterable
4646

4747
class toIteratorVsIterator(xs: Iterable[Int]) {
48-
xs.iterator()
48+
xs.iterator
4949
}
5050
~~~
5151

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ScalaModulePlugin._
33

44
inThisBuild(Seq(
55
resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
6-
crossScalaVersions := Seq("2.12.6", "2.13.0-pre-abf21b9", "2.11.12")
6+
crossScalaVersions := Seq("2.12.6", "2.13.0-pre-a002630", "2.11.12")
77
))
88

99
lazy val `scala-collection-compat` = crossProject(JSPlatform, JVMPlatform)

scalafix/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ lazy val input = project
2323
lazy val output = project
2424
.settings(
2525
resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
26-
scalaVersion := "2.13.0-pre-abf21b9"
26+
scalaVersion := "2.13.0-pre-a002630"
2727
)
2828

2929
lazy val tests = project

scalafix/output/src/main/scala/fix/TraversableSrc.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ object TraversableSrc {
44
def foo(xs: Iterable[(Int, String)], ys: List[Int]): Unit = {
55
xs.to(List)
66
xs.to(Set)
7-
xs.iterator()
8-
ys.iterator()
7+
xs.iterator
8+
ys.iterator
99
}
1010
}

scalafix/rules/src/main/scala/fix/Scalacollectioncompat_NewCollections.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ case class Scalacollectioncompat_NewCollections(index: SemanticdbIndex)
2323
Symbol("_root_.scala.collection.TraversableLike.to.")
2424
)
2525
val iterator = SymbolMatcher.normalized(
26-
Symbol("_root_.scala.collection.LinearSeqLike.iterator."),
2726
Symbol("_root_.scala.collection.TraversableLike.toIterator.")
2827
)
2928
val tupleZipped = SymbolMatcher.normalized(
@@ -34,7 +33,7 @@ case class Scalacollectioncompat_NewCollections(index: SemanticdbIndex)
3433
def replaceToList(ctx: RuleCtx) =
3534
ctx.tree.collect {
3635
case iterator(t: Name) =>
37-
ctx.replaceTree(t, "iterator()")
36+
ctx.replaceTree(t, "iterator")
3837
case toTpe(n: Name) =>
3938
(for {
4039
name <- n.tokens.lastOption

0 commit comments

Comments
 (0)