diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-22 16:42:04 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-22 16:42:04 -0700 |
commit | 6dbdb09711140c8022a8721c520dd08661bb1fb2 (patch) | |
tree | b4c698cdda5ec752139c72ab930193c3ae47e6b0 /src/library | |
parent | 1e148c88d860751c8f3a1c9b21a4505330a36c35 (diff) | |
parent | 67b3b9da7a517f702c331b42987f1debe49184d6 (diff) | |
download | scala-6dbdb09711140c8022a8721c520dd08661bb1fb2.tar.gz scala-6dbdb09711140c8022a8721c520dd08661bb1fb2.tar.bz2 scala-6dbdb09711140c8022a8721c520dd08661bb1fb2.zip |
Merge pull request #5047 from kmizu/resolve-several-warnings
Resolve several deprecation warnings
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/concurrent/SyncChannel.scala | 8 | ||||
-rw-r--r-- | src/library/scala/sys/process/ProcessBuilderImpl.scala | 2 | ||||
-rw-r--r-- | src/library/scala/sys/process/ProcessImpl.scala | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/library/scala/concurrent/SyncChannel.scala b/src/library/scala/concurrent/SyncChannel.scala index ec584b3eb0..735598935c 100644 --- a/src/library/scala/concurrent/SyncChannel.scala +++ b/src/library/scala/concurrent/SyncChannel.scala @@ -31,10 +31,10 @@ class SyncChannel[A] { pendingReads = pendingReads.tail // let reader continue - readReq set data + readReq put data // resolve write request - writeReq set true + writeReq put true } else { // enqueue write request @@ -57,10 +57,10 @@ class SyncChannel[A] { pendingWrites = pendingWrites.tail // let writer continue - writeReq set true + writeReq.put(true) // resolve read request - readReq set data + readReq.put (data) } else { // enqueue read request diff --git a/src/library/scala/sys/process/ProcessBuilderImpl.scala b/src/library/scala/sys/process/ProcessBuilderImpl.scala index 236baaf038..eef140c16a 100644 --- a/src/library/scala/sys/process/ProcessBuilderImpl.scala +++ b/src/library/scala/sys/process/ProcessBuilderImpl.scala @@ -56,7 +56,7 @@ private[process] trait ProcessBuilderImpl { success put false val t = Spawn({ runImpl(io) - success set true + success.put(true) }, io.daemonizeThreads) new ThreadProcess(t, success) diff --git a/src/library/scala/sys/process/ProcessImpl.scala b/src/library/scala/sys/process/ProcessImpl.scala index 559c0ee525..6da0dee056 100644 --- a/src/library/scala/sys/process/ProcessImpl.scala +++ b/src/library/scala/sys/process/ProcessImpl.scala @@ -30,8 +30,8 @@ private[process] trait ProcessImpl { def apply[T](f: => T): (Thread, () => T) = { val result = new SyncVar[Either[Throwable, T]] def run(): Unit = - try result set Right(f) - catch { case e: Exception => result set Left(e) } + try result.put(Right(f)) + catch { case e: Exception => result.put(Left(e)) } val t = Spawn(run()) @@ -91,8 +91,8 @@ private[process] trait ProcessImpl { protected lazy val (processThread, getExitValue, destroyer) = { val code = new SyncVar[Option[Int]]() - code set None - val thread = Spawn(code set runAndExitValue()) + code.put(None) + val thread = Spawn(code.put(runAndExitValue())) ( thread, |