Merge pull request #5047 from kmizu/resolve-several-warnings

Resolve several deprecation warnings

6 files changed, 12 insertions, 12 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 3e60ef37c4..c5a3d605b1 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -977,7 +977,7 @@ trait Contexts { self: Analyzer =>
      */
     def isInPackageObject(sym: Symbol, pkg: Symbol): Boolean = {
       if (sym.isOverloaded) sym.alternatives.exists(alt => isInPackageObject(alt, pkg))
-      else pkg.isPackage && sym.owner != pkg && requiresQualifier(sym)
+      else pkg.hasPackageFlag && sym.owner != pkg && requiresQualifier(sym)
     }
 
     def isNameInScope(name: Name) = lookupSymbol(name, _ => true).isSuccess
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,
diff --git a/src/partest-extras/scala/tools/partest/Util.scala b/src/partest-extras/scala/tools/partest/Util.scala
index 60e9dbb0f9..511997ea35 100644
--- a/src/partest-extras/scala/tools/partest/Util.scala
+++ b/src/partest-extras/scala/tools/partest/Util.scala
@@ -14,7 +14,7 @@ object Util {
    * An alternative to [[scala.tools.partest.ReplTest]] that avoids the inconvenience of embedding
    * test code in a string.
    */
-  def trace[A](a: A) = macro traceImpl[A]
+  def trace[A](a: A): A = macro traceImpl[A]
 
   import scala.reflect.macros.blackbox.Context
   def traceImpl[A: c.WeakTypeTag](c: Context)(a: c.Expr[A]): c.Expr[A] = {
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
index f75381691f..34f9417e57 100644
--- a/src/reflect/scala/reflect/internal/Symbols.scala
+++ b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -835,7 +835,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     /** The package object symbol corresponding to this package or package class symbol, or NoSymbol otherwise */
     def packageObject: Symbol =
       if (isPackageClass) tpe.packageObject
-      else if (isPackage) moduleClass.packageObject
+      else if (hasPackageFlag) moduleClass.packageObject
       else NoSymbol
 
     /** If this is a constructor, its owner: otherwise this.