diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-04-01 14:05:31 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-04-01 14:05:31 +0200 |
| commit | 19dac8212090f81ffd18bad6d7cc929fbff9bec8 (patch) | |
| tree | 37943111ae925d9fdd092073a336cff3f6a38e98 /src/library/scala/util | |
| parent | ad361859546aaa84349714c0a5890492fec38939 (diff) | |
| parent | 6181525f60588228ce99ab3ef2593ecfcfd35066 (diff) | |
| download | scala-19dac8212090f81ffd18bad6d7cc929fbff9bec8.tar.gz scala-19dac8212090f81ffd18bad6d7cc929fbff9bec8.tar.bz2 scala-19dac8212090f81ffd18bad6d7cc929fbff9bec8.zip | |
Merge pull request #5068 from retronym/topic/jdk8ism2v2.12.0-M4
Accomodate and exploit new library, lang features JDK 8
Diffstat (limited to 'src/library/scala/util')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/util/control/NoStackTrace.scala | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 583f1539d1..a176748cd6 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -120,7 +120,7 @@ private[scala] trait PropertiesTrait { /** The default end of line character. */ - def lineSeparator = propOrElse("line.separator", "\n") + def lineSeparator = System.lineSeparator() /* Various well-known properties. */ def javaClassPath = propOrEmpty("java.class.path") diff --git a/src/library/scala/util/control/NoStackTrace.scala b/src/library/scala/util/control/NoStackTrace.scala index 3c42944af1..3647af4ac3 100644 --- a/src/library/scala/util/control/NoStackTrace.scala +++ b/src/library/scala/util/control/NoStackTrace.scala @@ -14,6 +14,8 @@ package util.control * on a global basis via a system property wrapper in * [[scala.sys.SystemProperties]]. * + * @note Since JDK 1.7, a similar effect can be achieved with `class Ex extends Throwable(..., writableStackTrace = false)` + * * @author Paul Phillips * @since 2.8 */ |