Skip to content

Commit 6912805

Browse files
xuwei-kxuwei-k
committed
fix procedure syntax
1 parent 057f1e3 commit 6912805

File tree

17 files changed

+165
-165
lines changed

17 files changed

+165
-165
lines changed

‎benchmark/src/main/scala/bench/CodeGen.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object Generator {
3838

3939
def sayArrayI(oa: Option[Array[Int]]) = oa match { case Some(a) => a.mkString("Array(", ",", ")"); case _ => "" }
4040

41-
def agreement(target: java.io.File, sizes: Option[Array[Int]] = None) {
41+
def agreement(target: java.io.File, sizes: Option[Array[Int]] = None): Unit = {
4242
val q = "\""
4343
if (target.exists) throw new java.io.IOException("Generator will not write to existing file: " + target.getPath)
4444
writeTo(target){ pr =>
@@ -102,7 +102,7 @@ object Generator {
102102
}
103103
}
104104

105-
def quickBenchWithThyme(target: java.io.File, sizes: Option[Array[Int]] = None) {
105+
def quickBenchWithThyme(target: java.io.File, sizes: Option[Array[Int]] = None): Unit = {
106106
val q = "\""
107107
if (target.exists) throw new java.io.IOException("Generator will not write to existing file: " + target.getPath)
108108
writeTo(target){ pr =>
@@ -179,7 +179,7 @@ object Generator {
179179
}
180180
}
181181

182-
def jmhBench(target: java.io.File = new java.io.File("JmhBench.scala"), sizes: Option[Array[Int]] = Some(jmhsizes)) {
182+
def jmhBench(target: java.io.File = new java.io.File("JmhBench.scala"), sizes: Option[Array[Int]] = Some(jmhsizes)): Unit = {
183183
val q = "\""
184184
if (target.exists) throw new java.io.IOException("Generator will not write to existing file: " + target.getPath)
185185
writeTo(target){ pr =>

‎benchmark/src/main/scala/bench/ParseJmhLog.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ object ParseJmhLog {
6363
"mdtc" -> "map/filter/take trio"
6464
)
6565

66-
private def ensure(satisfied: Boolean)(not: => Unit) {
66+
private def ensure(satisfied: Boolean)(not: => Unit): Unit = {
6767
if (!satisfied) {
6868
not
6969
assert(satisfied)

‎fnGen/WrapFnGen.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,15 @@ object WrapFnGen {
291291
lines.iterator.filter(_.nonBlank) == text.lines.filter(_.nonBlank)
292292
}
293293

294-
def write(f: java.io.File, text: String) {
294+
def write(f: java.io.File, text: String): Unit = {
295295
if (!f.exists || !sameText(f, text)) {
296296
val p = new java.io.PrintWriter(f)
297297
try { p.println(text) }
298298
finally { p.close() }
299299
}
300300
}
301301

302-
def main(args: Array[String]) {
302+
def main(args: Array[String]): Unit = {
303303
val names = args.iterator.map(x => new java.io.File(x))
304304
write(names.next, converterContents)
305305
}

‎src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ object PrimitiveIteratorConverters {
4242
def hasNext = it.hasNext
4343
override def next() = it.next().asInstanceOf[java.lang.Double]
4444
def nextDouble() = it.next()
45-
override def remove() { throw new UnsupportedOperationException("remove on scala.collection.Iterator") }
46-
override def forEachRemaining(c: java.util.function.Consumer[_ >: java.lang.Double]) {
45+
override def remove(): Unit = { throw new UnsupportedOperationException("remove on scala.collection.Iterator") }
46+
override def forEachRemaining(c: java.util.function.Consumer[_ >: java.lang.Double]): Unit = {
4747
while (it.hasNext) c.accept(it.next)
4848
}
49-
override def forEachRemaining(c: java.util.function.DoubleConsumer) {
49+
override def forEachRemaining(c: java.util.function.DoubleConsumer): Unit = {
5050
while (it.hasNext) c.accept(it.next)
5151
}
5252
}
@@ -63,11 +63,11 @@ object PrimitiveIteratorConverters {
6363
def hasNext = it.hasNext
6464
override def next() = it.next().asInstanceOf[java.lang.Integer]
6565
def nextInt() = it.next()
66-
override def remove() { throw new UnsupportedOperationException("remove on scala.collection.Iterator") }
67-
override def forEachRemaining(c: java.util.function.Consumer[_ >: java.lang.Integer]) {
66+
override def remove(): Unit = { throw new UnsupportedOperationException("remove on scala.collection.Iterator") }
67+
override def forEachRemaining(c: java.util.function.Consumer[_ >: java.lang.Integer]): Unit = {
6868
while (it.hasNext) c.accept(it.next)
6969
}
70-
override def forEachRemaining(c: java.util.function.IntConsumer) {
70+
override def forEachRemaining(c: java.util.function.IntConsumer): Unit = {
7171
while (it.hasNext) c.accept(it.next)
7272
}
7373
}
@@ -84,11 +84,11 @@ object PrimitiveIteratorConverters {
8484
def hasNext = it.hasNext
8585
override def next() = it.next().asInstanceOf[java.lang.Long]
8686
def nextLong() = it.next()
87-
override def remove() { throw new UnsupportedOperationException("remove on scala.collection.Iterator") }
88-
override def forEachRemaining(c: java.util.function.Consumer[_ >: java.lang.Long]) {
87+
override def remove(): Unit = { throw new UnsupportedOperationException("remove on scala.collection.Iterator") }
88+
override def forEachRemaining(c: java.util.function.Consumer[_ >: java.lang.Long]): Unit = {
8989
while (it.hasNext) c.accept(it.next)
9090
}
91-
override def forEachRemaining(c: java.util.function.LongConsumer) {
91+
override def forEachRemaining(c: java.util.function.LongConsumer): Unit = {
9292
while (it.hasNext) c.accept(it.next)
9393
}
9494
}

‎src/main/scala/scala/compat/java8/StreamConverters.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ trait Priority1StreamConverters extends Priority2StreamConverters {
9696
if (stream.isParallel) accumulate.to[Coll](cbf)
9797
else {
9898
val b = cbf()
99-
stream.forEachOrdered(new java.util.function.Consumer[A]{ def accept(a: A) { b += a } })
99+
stream.forEachOrdered(new java.util.function.Consumer[A]{ def accept(a: A): Unit = { b += a } })
100100
b.result()
101101
}
102102
}
@@ -268,7 +268,7 @@ with converterImpl.Priority1AccumulatorConverters
268268
if (stream.isParallel) accumulate.to[Coll](cbf)
269269
else {
270270
val b = cbf()
271-
stream.forEachOrdered(new java.util.function.DoubleConsumer{ def accept(d: Double) { b += d } })
271+
stream.forEachOrdered(new java.util.function.DoubleConsumer{ def accept(d: Double): Unit = { b += d } })
272272
b.result()
273273
}
274274
}
@@ -281,7 +281,7 @@ with converterImpl.Priority1AccumulatorConverters
281281
if (stream.isParallel) accumulate.to[Coll](cbf)
282282
else {
283283
val b = cbf()
284-
stream.forEachOrdered(new java.util.function.IntConsumer{ def accept(d: Int) { b += d } })
284+
stream.forEachOrdered(new java.util.function.IntConsumer{ def accept(d: Int): Unit = { b += d } })
285285
b.result()
286286
}
287287
}
@@ -294,7 +294,7 @@ with converterImpl.Priority1AccumulatorConverters
294294
if (stream.isParallel) accumulate.to[Coll](cbf)
295295
else {
296296
val b = cbf()
297-
stream.forEachOrdered(new java.util.function.LongConsumer{ def accept(d: Long) { b += d } })
297+
stream.forEachOrdered(new java.util.function.LongConsumer{ def accept(d: Long): Unit = { b += d } })
298298
b.result()
299299
}
300300
}

‎src/main/scala/scala/compat/java8/collectionImpl/Accumulator.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ object Accumulator {
212212
def supplier[A] = new java.util.function.Supplier[Accumulator[A]]{ def get: Accumulator[A] = new Accumulator[A] }
213213

214214
/** A `BiConsumer` that adds an element to an `Accumulator`, suitable for use with `java.util.stream.Stream`'s `collect` method. */
215-
def adder[A] = new java.util.function.BiConsumer[Accumulator[A], A]{ def accept(ac: Accumulator[A], a: A) { ac += a } }
215+
def adder[A] = new java.util.function.BiConsumer[Accumulator[A], A]{ def accept(ac: Accumulator[A], a: A): Unit = { ac += a } }
216216

217217
/** A `BiConsumer` that merges `Accumulator`s, suitable for use with `java.util.stream.Stream`'s `collect` method. */
218-
def merger[A] = new java.util.function.BiConsumer[Accumulator[A], Accumulator[A]]{ def accept(a1: Accumulator[A], a2: Accumulator[A]) { a1 drain a2 } }
218+
def merger[A] = new java.util.function.BiConsumer[Accumulator[A], Accumulator[A]]{ def accept(a1: Accumulator[A], a2: Accumulator[A]): Unit = { a1 drain a2 } }
219219

220220
/** Builds an `Accumulator` from any `TraversableOnce` */
221221
def from[A](source: TraversableOnce[A]) = {
@@ -290,7 +290,7 @@ private[java8] class AccumulatorStepper[A](private val acc: Accumulator[A]) exte
290290
}
291291

292292
// Overridden for efficiency
293-
override def foreach(f: A => Unit) {
293+
override def foreach(f: A => Unit): Unit = {
294294
while (N > 0) {
295295
if (i >= n) loadMore()
296296
val i0 = i
@@ -304,7 +304,7 @@ private[java8] class AccumulatorStepper[A](private val acc: Accumulator[A]) exte
304304
}
305305

306306
// Overridden for efficiency
307-
override def forEachRemaining(f: java.util.function.Consumer[_ >: A]) {
307+
override def forEachRemaining(f: java.util.function.Consumer[_ >: A]): Unit = {
308308
while (N > 0) {
309309
if (i >= n) loadMore()
310310
val i0 = i

‎src/main/scala/scala/compat/java8/collectionImpl/DoubleAccumulator.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@ object DoubleAccumulator {
206206
def supplier = new java.util.function.Supplier[DoubleAccumulator]{ def get: DoubleAccumulator = new DoubleAccumulator }
207207

208208
/** A `BiConsumer` that adds an element to an `Accumulator`, suitable for use with `java.util.stream.DoubleStream`'s `collect` method. */
209-
def adder = new java.util.function.ObjDoubleConsumer[DoubleAccumulator]{ def accept(ac: DoubleAccumulator, a: Double) { ac += a } }
209+
def adder = new java.util.function.ObjDoubleConsumer[DoubleAccumulator]{ def accept(ac: DoubleAccumulator, a: Double): Unit = { ac += a } }
210210

211211
/** A `BiConsumer` that adds a boxed `Double` to an `DoubleAccumulator`, suitable for use with `java.util.stream.Stream`'s `collect` method. */
212-
def boxedAdder = new java.util.function.BiConsumer[DoubleAccumulator, Double]{ def accept(ac: DoubleAccumulator, a: Double) { ac += a } }
212+
def boxedAdder = new java.util.function.BiConsumer[DoubleAccumulator, Double]{ def accept(ac: DoubleAccumulator, a: Double): Unit = { ac += a } }
213213

214214
/** A `BiConsumer` that merges `DoubleAccumulator`s, suitable for use with `java.util.stream.DoubleStream`'s `collect` method. Suitable for `Stream[Double]` also. */
215-
def merger = new java.util.function.BiConsumer[DoubleAccumulator, DoubleAccumulator]{ def accept(a1: DoubleAccumulator, a2: DoubleAccumulator) { a1 drain a2 } }
215+
def merger = new java.util.function.BiConsumer[DoubleAccumulator, DoubleAccumulator]{ def accept(a1: DoubleAccumulator, a2: DoubleAccumulator): Unit = { a1 drain a2 } }
216216

217217
/** Builds a `DoubleAccumulator` from any `Double`-valued `TraversableOnce` */
218218
def from[A](source: TraversableOnce[Double]) = {
@@ -287,7 +287,7 @@ private[java8] class DoubleAccumulatorStepper(private val acc: DoubleAccumulator
287287
}
288288

289289
// Overridden for efficiency
290-
override def foreach(f: Double => Unit) {
290+
override def foreach(f: Double => Unit): Unit = {
291291
while (N > 0) {
292292
if (i >= n) loadMore()
293293
val i0 = i
@@ -301,7 +301,7 @@ private[java8] class DoubleAccumulatorStepper(private val acc: DoubleAccumulator
301301
}
302302

303303
// Overridden for efficiency
304-
override def forEachRemaining(f: java.util.function.DoubleConsumer) {
304+
override def forEachRemaining(f: java.util.function.DoubleConsumer): Unit = {
305305
while (N > 0) {
306306
if (i >= n) loadMore()
307307
val i0 = i

‎src/main/scala/scala/compat/java8/collectionImpl/IntAccumulator.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,13 @@ object IntAccumulator {
213213
def supplier = new java.util.function.Supplier[IntAccumulator]{ def get: IntAccumulator = new IntAccumulator }
214214

215215
/** A `BiConsumer` that adds an element to an `Accumulator`, suitable for use with `java.util.stream.IntStream`'s `collect` method. */
216-
def adder = new java.util.function.ObjIntConsumer[IntAccumulator]{ def accept(ac: IntAccumulator, a: Int) { ac += a } }
216+
def adder = new java.util.function.ObjIntConsumer[IntAccumulator]{ def accept(ac: IntAccumulator, a: Int): Unit = { ac += a } }
217217

218218
/** A `BiConsumer` that adds a boxed `Int` to an `IntAccumulator`, suitable for use with `java.util.stream.Stream`'s `collect` method. */
219-
def boxedAdder = new java.util.function.BiConsumer[IntAccumulator, Int]{ def accept(ac: IntAccumulator, a: Int) { ac += a } }
219+
def boxedAdder = new java.util.function.BiConsumer[IntAccumulator, Int]{ def accept(ac: IntAccumulator, a: Int): Unit = { ac += a } }
220220

221221
/** A `BiConsumer` that merges `IntAccumulator`s, suitable for use with `java.util.stream.IntStream`'s `collect` method. Suitable for `Stream[Int]` also. */
222-
def merger = new java.util.function.BiConsumer[IntAccumulator, IntAccumulator]{ def accept(a1: IntAccumulator, a2: IntAccumulator) { a1 drain a2 } }
222+
def merger = new java.util.function.BiConsumer[IntAccumulator, IntAccumulator]{ def accept(a1: IntAccumulator, a2: IntAccumulator): Unit = { a1 drain a2 } }
223223

224224
/** Builds an `IntAccumulator` from any `Int`-valued `TraversableOnce` */
225225
def from[A](source: TraversableOnce[Int]) = {
@@ -294,7 +294,7 @@ private[java8] class IntAccumulatorStepper(private val acc: IntAccumulator) exte
294294
}
295295

296296
// Overridden for efficiency
297-
override def foreach(f: Int => Unit) {
297+
override def foreach(f: Int => Unit): Unit = {
298298
while (N > 0) {
299299
if (i >= n) loadMore()
300300
val i0 = i
@@ -308,7 +308,7 @@ private[java8] class IntAccumulatorStepper(private val acc: IntAccumulator) exte
308308
}
309309

310310
// Overridden for efficiency
311-
override def forEachRemaining(f: java.util.function.IntConsumer) {
311+
override def forEachRemaining(f: java.util.function.IntConsumer): Unit = {
312312
while (N > 0) {
313313
if (i >= n) loadMore()
314314
val i0 = i

‎src/main/scala/scala/compat/java8/collectionImpl/LongAccumulator.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,13 @@ object LongAccumulator {
207207
def supplier = new java.util.function.Supplier[LongAccumulator]{ def get: LongAccumulator = new LongAccumulator }
208208

209209
/** A `BiConsumer` that adds an element to an `Accumulator`, suitable for use with `java.util.stream.LongStream`'s `collect` method. */
210-
def adder = new java.util.function.ObjLongConsumer[LongAccumulator]{ def accept(ac: LongAccumulator, a: Long) { ac += a } }
210+
def adder = new java.util.function.ObjLongConsumer[LongAccumulator]{ def accept(ac: LongAccumulator, a: Long): Unit = { ac += a } }
211211

212212
/** A `BiConsumer` that adds a boxed `Long` to an `LongAccumulator`, suitable for use with `java.util.stream.Stream`'s `collect` method. */
213-
def boxedAdder = new java.util.function.BiConsumer[LongAccumulator, Long]{ def accept(ac: LongAccumulator, a: Long) { ac += a } }
213+
def boxedAdder = new java.util.function.BiConsumer[LongAccumulator, Long]{ def accept(ac: LongAccumulator, a: Long): Unit = { ac += a } }
214214

215215
/** A `BiConsumer` that merges `LongAccumulator`s, suitable for use with `java.util.stream.LongStream`'s `collect` method. Suitable for `Stream[Long]` also. */
216-
def merger = new java.util.function.BiConsumer[LongAccumulator, LongAccumulator]{ def accept(a1: LongAccumulator, a2: LongAccumulator) { a1 drain a2 } }
216+
def merger = new java.util.function.BiConsumer[LongAccumulator, LongAccumulator]{ def accept(a1: LongAccumulator, a2: LongAccumulator): Unit = { a1 drain a2 } }
217217

218218
/** Builds a `LongAccumulator` from any `Long`-valued `TraversableOnce` */
219219
def from[A](source: TraversableOnce[Long]) = {
@@ -288,7 +288,7 @@ private[java8] class LongAccumulatorStepper(private val acc: LongAccumulator) ex
288288
}
289289

290290
// Overridden for efficiency
291-
override def foreach(f: Long => Unit) {
291+
override def foreach(f: Long => Unit): Unit = {
292292
while (N > 0) {
293293
if (i >= n) loadMore()
294294
val i0 = i
@@ -302,7 +302,7 @@ private[java8] class LongAccumulatorStepper(private val acc: LongAccumulator) ex
302302
}
303303

304304
// Overridden for efficiency
305-
override def forEachRemaining(f: java.util.function.LongConsumer) {
305+
override def forEachRemaining(f: java.util.function.LongConsumer): Unit = {
306306
while (N > 0) {
307307
if (i >= n) loadMore()
308308
val i0 = i

0 commit comments

Comments
 (0)