summaryrefslogtreecommitdiff
path: root/test/files/run/xMigration.check
diff options
context:
space:
mode:
authorRex Kerr <ichoran@gmail.com>2015-03-31 14:56:53 -0700
committerStefan Zeiger <szeiger@novocode.com>2016-08-12 13:50:37 +0200
commit30876fe2dd8cbe657a6cad6b11bbc34f10c29b36 (patch)
treef7cb3a8de91ac79ce22308f7a877c55f4dbf6755 /test/files/run/xMigration.check
parent6612ba010b0e70c53550d1e47141c8dc89a55f23 (diff)
downloadscala-30876fe2dd8cbe657a6cad6b11bbc34f10c29b36.tar.gz
scala-30876fe2dd8cbe657a6cad6b11bbc34f10c29b36.tar.bz2
scala-30876fe2dd8cbe657a6cad6b11bbc34f10c29b36.zip
SI-9019 TraversableLike stringPrefix broken for inner classes
This version preserves outer class and object names but discards any part of the name after a `$` that does not start with an upper-case letter. When an integer literal occurs after a `$`, the prefix up to that point is dropped so that classes defined within methods appear as top-level.
Diffstat (limited to 'test/files/run/xMigration.check')
-rw-r--r--test/files/run/xMigration.check14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/files/run/xMigration.check b/test/files/run/xMigration.check
index cd860bf394..9045146ab2 100644
--- a/test/files/run/xMigration.check
+++ b/test/files/run/xMigration.check
@@ -1,11 +1,11 @@
scala> Map(1 -> "eis").values // no warn
-res0: Iterable[String] = MapLike(eis)
+res0: Iterable[String] = MapLike.DefaultValuesIterable(eis)
scala> :setting -Xmigration:none
scala> Map(1 -> "eis").values // no warn
-res1: Iterable[String] = MapLike(eis)
+res1: Iterable[String] = MapLike.DefaultValuesIterable(eis)
scala> :setting -Xmigration:any
@@ -14,12 +14,12 @@ scala> Map(1 -> "eis").values // warn
`values` returns `Iterable[B]` rather than `Iterator[B]`.
Map(1 -> "eis").values // warn
^
-res2: Iterable[String] = MapLike(eis)
+res2: Iterable[String] = MapLike.DefaultValuesIterable(eis)
scala> :setting -Xmigration:2.8
scala> Map(1 -> "eis").values // no warn
-res3: Iterable[String] = MapLike(eis)
+res3: Iterable[String] = MapLike.DefaultValuesIterable(eis)
scala> :setting -Xmigration:2.7
@@ -28,12 +28,12 @@ scala> Map(1 -> "eis").values // warn
`values` returns `Iterable[B]` rather than `Iterator[B]`.
Map(1 -> "eis").values // warn
^
-res4: Iterable[String] = MapLike(eis)
+res4: Iterable[String] = MapLike.DefaultValuesIterable(eis)
scala> :setting -Xmigration:2.11
scala> Map(1 -> "eis").values // no warn
-res5: Iterable[String] = MapLike(eis)
+res5: Iterable[String] = MapLike.DefaultValuesIterable(eis)
scala> :setting -Xmigration // same as :any
@@ -42,6 +42,6 @@ scala> Map(1 -> "eis").values // warn
`values` returns `Iterable[B]` rather than `Iterator[B]`.
Map(1 -> "eis").values // warn
^
-res6: Iterable[String] = MapLike(eis)
+res6: Iterable[String] = MapLike.DefaultValuesIterable(eis)
scala> :quit