From b5bac6e5935ba25721d10fc0d9cd154ce536c3db Mon Sep 17 00:00:00 2001 From: Kota Mizushima Date: Thu, 17 Mar 2016 20:10:56 +0900 Subject: Fix one warning in Util.scala Explicitly annotate return type of trace macro to avoid type inference --- src/partest-extras/scala/tools/partest/Util.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] = { -- cgit v1.2.3 From ca741091c898e17d082c496443b6b258ef4020e8 Mon Sep 17 00:00:00 2001 From: Kota Mizushima Date: Thu, 17 Mar 2016 20:17:43 +0900 Subject: * Replace isPackage with hasPackageFlag --- src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 2 +- src/reflect/scala/reflect/internal/Symbols.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index cb4eab335b..bb7dc3746b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -978,7 +978,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/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 9a3f6a6f3f..0a044b23d9 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -838,7 +838,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. -- cgit v1.2.3 From 67b3b9da7a517f702c331b42987f1debe49184d6 Mon Sep 17 00:00:00 2001 From: Kota Mizushima Date: Thu, 17 Mar 2016 20:21:49 +0900 Subject: Resolve warnings related to SyncVar#set Replace it with SyncVar#put --- src/library/scala/concurrent/SyncChannel.scala | 8 ++++---- src/library/scala/sys/process/ProcessBuilderImpl.scala | 2 +- 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, -- cgit v1.2.3