From c3e3b2c6fdd00b4ab3729cc873718b5969a4b60a Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 22 May 2016 21:47:19 +0900 Subject: [PATCH] use private[this] --- concurrent/src/main/scala/scalaz/concurrent/Actor.scala | 2 +- concurrent/src/main/scala/scalaz/concurrent/Future.scala | 2 +- core/src/main/scala/scalaz/ApplicativePlus.scala | 2 +- core/src/main/scala/scalaz/CaseInsensitive.scala | 4 ++-- core/src/main/scala/scalaz/FingerTree.scala | 2 +- core/src/main/scala/scalaz/Kan.scala | 6 +++--- core/src/main/scala/scalaz/Tree.scala | 4 ++-- core/src/main/scala/scalaz/syntax/ApplicativeSyntax.scala | 4 ++-- effect/src/main/scala/scalaz/effect/ST.scala | 2 +- iteratee/src/main/scala/scalaz/iteratee/EnumeratorT.scala | 2 +- .../src/main/scala/scalaz/scalacheck/ScalazProperties.scala | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/concurrent/src/main/scala/scalaz/concurrent/Actor.scala b/concurrent/src/main/scala/scalaz/concurrent/Actor.scala index 8c4dfb7369..2287a19e6f 100644 --- a/concurrent/src/main/scala/scalaz/concurrent/Actor.scala +++ b/concurrent/src/main/scala/scalaz/concurrent/Actor.scala @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference */ final case class Actor[A](handler: A => Unit, onError: Throwable => Unit = ActorUtils.rethrowError) (implicit val strategy: Strategy) { - private val head = new AtomicReference[Node[A]] + private[this] val head = new AtomicReference[Node[A]] val toEffect: Run[A] = Run[A](a => this ! a) diff --git a/concurrent/src/main/scala/scalaz/concurrent/Future.scala b/concurrent/src/main/scala/scalaz/concurrent/Future.scala index 075a0e1297..6870f51d64 100644 --- a/concurrent/src/main/scala/scalaz/concurrent/Future.scala +++ b/concurrent/src/main/scala/scalaz/concurrent/Future.scala @@ -348,7 +348,7 @@ object Future { } } - private val finishedCallback: Any => Trampoline[Unit] = + private[this] val finishedCallback: Any => Trampoline[Unit] = _ => sys.error("impossible, since there can only be one runner of chooseAny") // implementation runs all threads, dumping to a shared queue diff --git a/core/src/main/scala/scalaz/ApplicativePlus.scala b/core/src/main/scala/scalaz/ApplicativePlus.scala index c83388141f..103e9f7410 100644 --- a/core/src/main/scala/scalaz/ApplicativePlus.scala +++ b/core/src/main/scala/scalaz/ApplicativePlus.scala @@ -22,7 +22,7 @@ trait ApplicativePlus[F[_]] extends Applicative[F] with PlusEmpty[F] { self => implicit def G = G0 } - private class Mutual[A](a: F[A]) { + private[this] class Mutual[A](a: F[A]) { lazy val y: Free.Trampoline[F[List[A]]] = z map (plus(_, point(Nil))) lazy val z: Free.Trampoline[F[List[A]]] = y map (apply2(a, _)(_ :: _)) } diff --git a/core/src/main/scala/scalaz/CaseInsensitive.scala b/core/src/main/scala/scalaz/CaseInsensitive.scala index 29a5890cab..ddda8ca013 100644 --- a/core/src/main/scala/scalaz/CaseInsensitive.scala +++ b/core/src/main/scala/scalaz/CaseInsensitive.scala @@ -11,7 +11,7 @@ sealed abstract class CaseInsensitive[A] { case _ => false } - private val hash = Need(foldedCase.hashCode) + private[this] val hash = Need(foldedCase.hashCode) final override def hashCode: Int = hash.value } @@ -21,7 +21,7 @@ object CaseInsensitive extends CaseInsensitiveInstances { private[scalaz] def mk[A](a: A, fc: => A): CaseInsensitive[A] = new CaseInsensitive[A] { val original = a - val fcCache = Need(fc) + private[this] val fcCache = Need(fc) def foldedCase = fcCache.value } } diff --git a/core/src/main/scala/scalaz/FingerTree.scala b/core/src/main/scala/scalaz/FingerTree.scala index e6b132236d..2c05b6aacc 100644 --- a/core/src/main/scala/scalaz/FingerTree.scala +++ b/core/src/main/scala/scalaz/FingerTree.scala @@ -1014,7 +1014,7 @@ object FingerTree extends FingerTreeInstances { (implicit ms: Reducer[A, V]): FingerTree[V, A] = new FingerTree[V, A] { implicit val nMeasure = nodeMeasure[A, V] - val mz = Need(m) + private[this] val mz = Need(m) def fold[B](b: V => B, f: (V, A) => B, d: (V, Finger[V, A], => FingerTree[V, Node[V, A]], Finger[V, A]) => B): B = d(v, pr, mz.value, sf) } diff --git a/core/src/main/scala/scalaz/Kan.scala b/core/src/main/scala/scalaz/Kan.scala index 02ed2073e5..d9548081ba 100644 --- a/core/src/main/scala/scalaz/Kan.scala +++ b/core/src/main/scala/scalaz/Kan.scala @@ -82,7 +82,7 @@ trait Lan[G[_], H[_], A] { lan => def map[B](g: A => B): Lan[G, H, B] = new Lan[G, H, B] { type I = lan.I - val vc = Need(lan.v) + private[this] val vc = Need(lan.v) def v = vc.value def f(gi: G[I]) = g(lan f gi) } @@ -156,7 +156,7 @@ private trait LanApply[G[_], H[_]] extends Apply[Lan[G, H, ?]] with LanFunctor[G def G: Functor[G] def H: Apply[H] - private abstract class Internal[A] { + private[this] abstract class Internal[A] { type T def value: A } @@ -171,7 +171,7 @@ private trait LanApply[G[_], H[_]] extends Apply[Lan[G, H, ?]] with LanFunctor[G type T = value.I } type I = (xfp.T, xp.T) - val vc = Need(H.tuple2(xfp.value.v, xp.value.v)) + private[this] val vc = Need(H.tuple2(xfp.value.v, xp.value.v)) def v = vc.value def f(gi: G[I]) = xfp.value.f(G.map(gi)(_._1))(xp.value.f(G.map(gi)(_._2))) } diff --git a/core/src/main/scala/scalaz/Tree.scala b/core/src/main/scala/scalaz/Tree.scala index e0cec32985..d18d976d12 100644 --- a/core/src/main/scala/scalaz/Tree.scala +++ b/core/src/main/scala/scalaz/Tree.scala @@ -195,8 +195,8 @@ object Tree extends TreeInstances { object Node { def apply[A](root: => A, forest: => Stream[Tree[A]]): Tree[A] = { new Tree[A] { - val rootc = Need(root) - val forestc = Need(forest) + private[this] val rootc = Need(root) + private[this] val forestc = Need(forest) def rootLabel = rootc.value def subForest = forestc.value diff --git a/core/src/main/scala/scalaz/syntax/ApplicativeSyntax.scala b/core/src/main/scala/scalaz/syntax/ApplicativeSyntax.scala index ca8ed13db9..d8e443227e 100644 --- a/core/src/main/scala/scalaz/syntax/ApplicativeSyntax.scala +++ b/core/src/main/scala/scalaz/syntax/ApplicativeSyntax.scala @@ -26,7 +26,7 @@ trait ToApplicativeOps extends ToApplicativeOps0 with ToApplyOps { //// implicit def ApplicativeIdV[A](v: => A) = new ApplicativeIdV[A] { - val nv = Need(v) + private[this] val nv = Need(v) def self = nv.value } @@ -49,7 +49,7 @@ trait ApplicativeSyntax[F[_]] extends ApplySyntax[F] { def η[A](a: => A)(implicit F: Applicative[F]): F[A] = F.point(a) implicit def ApplicativeIdV[A](v: => A) = new ApplicativeIdV[A] { - val vc = Need(v) + private[this] val vc = Need(v) def self = vc.value } diff --git a/effect/src/main/scala/scalaz/effect/ST.scala b/effect/src/main/scala/scalaz/effect/ST.scala index fa8ab4c461..c9ec84b4d0 100644 --- a/effect/src/main/scala/scalaz/effect/ST.scala +++ b/effect/src/main/scala/scalaz/effect/ST.scala @@ -67,7 +67,7 @@ sealed abstract class STArray[S, A] { def z: A implicit def tag: ClassTag[A] - val arr = Need(Array.fill(size)(z)) + private[this] val arr = Need(Array.fill(size)(z)) private def value: Array[A] = arr.value diff --git a/iteratee/src/main/scala/scalaz/iteratee/EnumeratorT.scala b/iteratee/src/main/scala/scalaz/iteratee/EnumeratorT.scala index 0d5b5d6383..bf130f52b7 100644 --- a/iteratee/src/main/scala/scalaz/iteratee/EnumeratorT.scala +++ b/iteratee/src/main/scala/scalaz/iteratee/EnumeratorT.scala @@ -187,7 +187,7 @@ trait EnumeratorTFunctions { def enumIndexedSeq[E, F[_]: Monad](a : IndexedSeq[E], min: Int = 0, max: Option[Int] = None) : EnumeratorT[E, F] = new EnumeratorT[E, F] { - private val limit = max.map(_ min (a.length)).getOrElse(a.length) + private[this] val limit = max.map(_ min (a.length)).getOrElse(a.length) def apply[A] = { def loop(pos : Int): StepT[E, F, A] => IterateeT[E, F, A] = { s => diff --git a/scalacheck-binding/src/main/scala/scalaz/scalacheck/ScalazProperties.scala b/scalacheck-binding/src/main/scala/scalaz/scalacheck/ScalazProperties.scala index d5ca0789e8..b635b997bc 100644 --- a/scalacheck-binding/src/main/scala/scalaz/scalacheck/ScalazProperties.scala +++ b/scalacheck-binding/src/main/scala/scalaz/scalacheck/ScalazProperties.scala @@ -63,7 +63,7 @@ object ScalazProperties { def minmaxsucc[A](implicit A: Enum[A]): Prop = A.enumLaw.minmaxsucc - private val smallInt = Gen.choose(-100, 100) + private[this] val smallInt = Gen.choose(-100, 100) def succn[A](implicit A: Enum[A], arb: Arbitrary[A]) = forAll((x: A) => forAll(smallInt)(A.enumLaw.succn(x, _)))