summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-12-12 15:31:38 +0100
committerGitHub <noreply@github.com>2016-12-12 15:31:38 +0100
commit2d90142eca20416971d3f8a2d79aaf0a4531b8ce (patch)
treea6e2cc4a4cfab2324124ac16229879de47d163fd
parentd34e44e99488e4f91a677ddbc2e8ae6232273456 (diff)
parentf0d4e1efd9063a7ad1de052d9d68ed0cf7219cac (diff)
downloadscala-2d90142eca20416971d3f8a2d79aaf0a4531b8ce.tar.gz
scala-2d90142eca20416971d3f8a2d79aaf0a4531b8ce.tar.bz2
scala-2d90142eca20416971d3f8a2d79aaf0a4531b8ce.zip
Merge pull request #5527 from som-snytt/fix/use-modern-replace
String.replaceAllLiterally is String.replace
-rw-r--r--src/library/scala/collection/immutable/StringLike.scala12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/library/scala/collection/immutable/StringLike.scala b/src/library/scala/collection/immutable/StringLike.scala
index af8703293f..fce0f073aa 100644
--- a/src/library/scala/collection/immutable/StringLike.scala
+++ b/src/library/scala/collection/immutable/StringLike.scala
@@ -165,20 +165,14 @@ self =>
if (toString.endsWith(suffix)) toString.substring(0, toString.length() - suffix.length)
else toString
- /** Replace all literal occurrences of `literal` with the string `replacement`.
- * This is equivalent to [[java.lang.String#replaceAll]] except that both arguments
- * are appropriately quoted to avoid being interpreted as metacharacters.
+ /** Replace all literal occurrences of `literal` with the literal string `replacement`.
+ * This method is equivalent to [[java.lang.String#replace]].
*
* @param literal the string which should be replaced everywhere it occurs
* @param replacement the replacement string
* @return the resulting string
*/
- def replaceAllLiterally(literal: String, replacement: String): String = {
- val arg1 = Regex.quote(literal)
- val arg2 = Regex.quoteReplacement(replacement)
-
- toString.replaceAll(arg1, arg2)
- }
+ def replaceAllLiterally(literal: String, replacement: String): String = toString.replace(literal, replacement)
/** For every line in this string:
*