Skip to content

Commit 891df92

Browse files
olafurpgjulienrf
authored andcommitted
Add dep on parent project.
1 parent 6bf57f5 commit 891df92

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ lazy val input = project.settings(
1717
scalafixSourceroot := sourceDirectory.in(Compile).value
1818
)
1919

20-
//val collections = ProjectRef(file(".."), "collections")
21-
//
20+
val collections = ProjectRef(file(".."), "collections")
21+
2222
lazy val output = project
2323
.settings(
24-
// resolvers := resolvers.in(collections).value,
25-
// libraryDependencies := libraryDependencies.in(collections).value,
26-
// scalaVersion := scalaVersion.in(collections).value,
27-
// scalaBinaryVersion := scalaBinaryVersion.in(collections).value
24+
resolvers := resolvers.in(collections).value,
25+
libraryDependencies := libraryDependencies.in(collections).value,
26+
scalaVersion := scalaVersion.in(collections).value,
27+
scalaBinaryVersion := scalaBinaryVersion.in(collections).value
2828
)
29-
// .dependsOn(collections) // collections/publishLocal is still necessary.
29+
.dependsOn(collections) // collections/publishLocal is still necessary.
3030

3131
lazy val tests = project
3232
.settings(

input/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ object Collectionstrawman_v0_Range {
5353
}
5454

5555
object Collectionstrawman_v0_Traversable {
56+
val x: Iterable[String] = ???
5657
def foo(xs: Traversable[(Int, String)], ys: List[Int]): Unit = {
5758
xs.toList
5859
xs.toSet
@@ -63,4 +64,4 @@ object Collectionstrawman_v0_Traversable {
6364
xs.toIterator
6465
ys.iterator
6566
}
66-
}
67+
}

rewrites/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
4040
}.asPatch
4141

4242
def rewrite(ctx: RewriteCtx): Patch = {
43+
ctx.debugSemanticCtx()
4344
def p(name: String) =
4445
s"scala.Predef.$name" -> s"strawman.collection.immutable.$name"
4546
def s(name: String, rename: Option[String] = None) =
@@ -50,6 +51,7 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
5051
def m(name: String) =
5152
s"scala.collection.mutable.$name" -> s"strawman.collection.mutable.$name"
5253
ctx.replaceSymbols(
54+
s("Set"),
5355
i("HashMap"),
5456
i("Map"),
5557
p("Map"),
@@ -65,6 +67,8 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
6567
i("`:+`"),
6668
i("Stream", Some("LazyList")),
6769
s("Stream", Some("LazyList")),
70+
s("Traversable", Some("Iterable")),
71+
"scala.Iterable" -> "strawman.collection.Iterable",
6872
s("`#::`"),
6973
s("Vector"),
7074
i("Vector"),

0 commit comments

Comments
 (0)