diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-05 09:58:52 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-05 09:58:52 -0800 |
| commit | 838c8a32d0a167cb4413f713d793036a93dd2464 (patch) | |
| tree | 1a85fe2e947141dd16e17c312bc78670db0b4369 | |
| parent | fd4178680643aa064d5a6f7b8e668f79e0be5cd4 (diff) | |
| parent | 24f2a3d73101e9e3c4f845f413f7a6dc2ac452af (diff) | |
| download | scala-838c8a32d0a167cb4413f713d793036a93dd2464.tar.gz scala-838c8a32d0a167cb4413f713d793036a93dd2464.tar.bz2 scala-838c8a32d0a167cb4413f713d793036a93dd2464.zip | |
Merge pull request #3453 from Ichoran/issue/4997
SI-4997 deprecate StringLike.linesIterator for StringLike.lines
| -rw-r--r-- | src/library/scala/collection/immutable/StringLike.scala | 1 | ||||
| -rw-r--r-- | test/files/run/global-showdef.scala | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/StringLike.scala b/src/library/scala/collection/immutable/StringLike.scala index 43d46cf4d0..8e1d950d00 100644 --- a/src/library/scala/collection/immutable/StringLike.scala +++ b/src/library/scala/collection/immutable/StringLike.scala @@ -131,6 +131,7 @@ self => * end characters, i.e. apply `.stripLineEnd` to all lines * returned by `linesWithSeparators`. */ + @deprecated("Use `lines` instead.","2.11.0") def linesIterator: Iterator[String] = linesWithSeparators map (line => new WrappedString(line).stripLineEnd) diff --git a/test/files/run/global-showdef.scala b/test/files/run/global-showdef.scala index c3ace590ed..1d4891fd1f 100644 --- a/test/files/run/global-showdef.scala +++ b/test/files/run/global-showdef.scala @@ -54,7 +54,7 @@ object Bippy { val run = new compiler.Run() run.compileSources(List(src)) } - output.linesIterator.toList + output.lines.toList } def showClass(name: String) = lines("-Yshow:typer", "-Xshow-class", name) def showObject(name: String) = lines("-Yshow:typer", "-Xshow-object", name) |