Merge pull request #4649 from janekdb/2.12.x-noTraceSuppression

Align noTraceSuppression val names to system property name

2 files changed, 5 insertions, 3 deletions

diff --git a/src/library/scala/sys/SystemProperties.scala b/src/library/scala/sys/SystemProperties.scala
index 6f8b13a89b..3ee4f6c708 100644
--- a/src/library/scala/sys/SystemProperties.scala
+++ b/src/library/scala/sys/SystemProperties.scala
@@ -86,6 +86,8 @@ object SystemProperties {
   lazy val headless            = bool("java.awt.headless", "system should not utilize a display device")
   lazy val preferIPv4Stack     = bool("java.net.preferIPv4Stack", "system should prefer IPv4 sockets")
   lazy val preferIPv6Addresses = bool("java.net.preferIPv6Addresses", "system should prefer IPv6 addresses")
-  lazy val noTraceSupression   = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation")
+  lazy val noTraceSuppression  = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation")
+  @deprecated("Use noTraceSuppression", "2.12.0")
+  def noTraceSupression        = noTraceSuppression
 }
 
diff --git a/src/library/scala/util/control/NoStackTrace.scala b/src/library/scala/util/control/NoStackTrace.scala
index b33b6a18dd..3c42944af1 100644
--- a/src/library/scala/util/control/NoStackTrace.scala
+++ b/src/library/scala/util/control/NoStackTrace.scala
@@ -26,7 +26,7 @@ trait NoStackTrace extends Throwable {
 object NoStackTrace {
   final def noSuppression = _noSuppression
 
-  // two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSupression.value calls back into NoStackTrace.noSuppression
+  // two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSuppression.value calls back into NoStackTrace.noSuppression
   final private var _noSuppression = false
-  _noSuppression = sys.SystemProperties.noTraceSupression.value
+  _noSuppression = sys.SystemProperties.noTraceSuppression.value
 }