Skip to content

Commit 9793424

Browse files
Remove show in repl; use .toString instead
1 parent e87a5d1 commit 9793424

File tree

8 files changed

+7
-183
lines changed

8 files changed

+7
-183
lines changed

compiler/src/dotty/tools/repl/ReplCompiler.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ReplCompiler(val directory: AbstractFile) extends Compiler {
5353
}
5454

5555
(1 to objectIndex)
56-
.foldLeft(addImport("dotty.Show".toTermName)(initCtx)) { (ictx, i) =>
56+
.foldLeft(initCtx) { (ictx, i) =>
5757
addImport(nme.EMPTY_PACKAGE ++ "." ++ objectNames(i))(ictx)
5858
}
5959
}
@@ -76,7 +76,7 @@ class ReplCompiler(val directory: AbstractFile) extends Compiler {
7676

7777
def createShow(name: TermName, pos: Position) = {
7878
val showName = name ++ "Show"
79-
val select = Select(Ident(name), "show".toTermName)
79+
val select = Select(Ident(name), nme.toString_)
8080
val valAsAnyRef = TypeApply(Select(Ident(name), nme.asInstanceOf_),
8181
List(Ident(tpnme.AnyRef)))
8282
val cond = InfixOp(valAsAnyRef,
@@ -154,7 +154,6 @@ class ReplCompiler(val directory: AbstractFile) extends Compiler {
154154
* package <none> {
155155
* object rs$line$nextId {
156156
* import rs$line${i <- 0 until nextId}._
157-
* import dotty.Show._
158157
*
159158
* <trees>
160159
* }

compiler/test-resources/repl/i3388

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
scala> val foo = "1"; foo.toInt
2-
val foo: String = "1"
2+
val foo: String = 1
33
val res0: Int = 1
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
scala> val s = ""
2+
val s: String = ""

compiler/test-resources/type-printer/prefixless

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
scala> List(1,2,3)
22
val res0: List[Int] = List(1, 2, 3)
33
scala> Map("foo" -> 1)
4-
val res1: Map[String, Int] = Map("foo" -> 1)
4+
val res1: Map[String, Int] = Map(foo -> 1)
55
scala> Seq('a','b')
66
val res2: Seq[Char] = List(a, b)
77
scala> Set(4, 5)

compiler/test-resources/type-printer/vals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ val xs: List[Int] = List(1)
77
scala> scala.util.Try(1)
88
val res0: scala.util.Try[Int] = Success(1)
99
scala> Map(1 -> "one")
10-
val res1: Map[Int, String] = Map(1 -> "one")
10+
val res1: Map[Int, String] = Map(1 -> one)

library/src/dotty/Show.scala

Lines changed: 0 additions & 81 deletions
This file was deleted.

library/test/dotty/ShowTests.scala

Lines changed: 0 additions & 94 deletions
This file was deleted.

tests/neg/i3537.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import dotty.Show._
2-
31
class Foo(x: Int)
42

53
object Test {

0 commit comments

Comments
 (0)