diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-14 13:14:53 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-14 13:14:53 -0700 |
| commit | 2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9 (patch) | |
| tree | 5e873d92aecc5534bb0dd523c33d2bbb83d2ee73 | |
| parent | f4c6762578e509fd850f2c08a200d9df0a6d461f (diff) | |
| parent | 953b776d49d7de55a74967f6a48beea763d22144 (diff) | |
| download | scala-2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9.tar.gz scala-2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9.tar.bz2 scala-2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9.zip | |
Merge pull request #3598 from som-snytt/issue/8266-amend-advice
SI-8266 Amend advice for deprecated octal 042
| -rw-r--r-- | src/compiler/scala/tools/reflect/FormatInterpolator.scala | 3 | ||||
| -rw-r--r-- | test/files/run/t8266-octal-interp.check | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/reflect/FormatInterpolator.scala b/src/compiler/scala/tools/reflect/FormatInterpolator.scala index 0258002850..e0f9bb6044 100644 --- a/src/compiler/scala/tools/reflect/FormatInterpolator.scala +++ b/src/compiler/scala/tools/reflect/FormatInterpolator.scala @@ -93,7 +93,8 @@ abstract class FormatInterpolator { case '\n' => "\\n" case '\f' => "\\f" case '\r' => "\\r" - case '\"' => "\\u0022" // $" in future + case '\"' => "${'\"'}" /* avoid lint warn */ + + " or a triple-quoted literal \"\"\"with embedded \" or \\u0022\"\"\"" // $" in future case '\'' => "'" case '\\' => """\\""" case x => "\\u%04x" format x diff --git a/test/files/run/t8266-octal-interp.check b/test/files/run/t8266-octal-interp.check index 6e9454119b..66ecafddc2 100644 --- a/test/files/run/t8266-octal-interp.check +++ b/test/files/run/t8266-octal-interp.check @@ -10,7 +10,7 @@ t8266-octal-interp.scala:6: warning: Octal escape literals are deprecated, use \ t8266-octal-interp.scala:7: warning: Octal escape literals are deprecated, use \r instead. f"a\15c", ^ -t8266-octal-interp.scala:8: warning: Octal escape literals are deprecated, use \u0022 instead. +t8266-octal-interp.scala:8: warning: Octal escape literals are deprecated, use ${'"'} or a triple-quoted literal """with embedded " or \u0022""" instead. f"a\42c", ^ t8266-octal-interp.scala:9: warning: Octal escape literals are deprecated, use \\ instead. |