Skip to content

Commit 1b5724e

Browse files
SethTisueSethTisue
committed
remove unused code, fix warnings
1 parent 7895a03 commit 1b5724e

37 files changed

+76
-124
lines changed

‎build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ def osgiExport(scalaVersion: String, version: String) = {
2323

2424
lazy val commonSettings = Seq(
2525
organization := "org.scala-lang.modules",
26-
version := "0.9.0-SNAPSHOT"
26+
version := "0.9.0-SNAPSHOT",
27+
scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked")
2728
)
2829

2930
lazy val fnGen = (project in file("fnGen")).

‎fnGen/WrapFnGen.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ object WrapFnGen {
1414
val packaging = "package scala.compat.java8"
1515

1616
import scala.tools.nsc._
17-
import scala.reflect.internal._
1817
val settings = new Settings(msg => sys.error(msg))
1918
settings.usejavacp.value = true
2019
val compiler = new Global(settings)
@@ -59,12 +58,12 @@ object WrapFnGen {
5958
}
6059

6160
implicit class SplitMyLinesAndStuff(s: String) {
62-
def toVec = s.linesIterator.toVector
61+
def toVec = s.lines.toVector
6362
def nonBlank = s.trim.length > 0
6463
}
6564

6665
implicit class TreeToText(t: Tree) {
67-
def text = showCode(t).replace("$", "").linesIterator.toVector
66+
def text = showCode(t).replace("$", "").lines.toVector
6867
}
6968

7069
case class Prioritized(lines: Vector[String], priority: Int) {
@@ -253,7 +252,6 @@ object WrapFnGen {
253252
q"""@inline implicit def $s2jImpN[..$scalafnTdefs](sf: $scalaType[..$scalafnTnames])(implicit ..$evs): $s2jValCN[..$tnParams] =
254253
new $s2jValCN[..$tnParams](sf.asInstanceOf[$scalaType[..$scalaTargs]])
255254
"""
256-
val depth = numberedA.size
257255
(tree, tdParams.length)
258256
}
259257

@@ -290,7 +288,7 @@ object WrapFnGen {
290288
def sameText(f: java.io.File, text: String): Boolean = {
291289
val x = scala.io.Source.fromFile(f)
292290
val lines = try { x.getLines.toVector } finally { x.close }
293-
lines.iterator.filter(_.nonBlank) == text.linesIterator.filter(_.nonBlank)
291+
lines.iterator.filter(_.nonBlank) == text.lines.filter(_.nonBlank)
294292
}
295293

296294
def write(f: java.io.File, text: String) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
*/
44
package scala.compat.java8
55

6+
import scala.language.implicitConversions
7+
68
import scala.concurrent.java8.FuturesConvertersImpl._
7-
import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutorService, ExecutionContextExecutor, impl }
8-
import java.util.concurrent.{ CompletionStage, Executor, ExecutorService, CompletableFuture }
9-
import scala.util.{ Try, Success, Failure }
10-
import java.util.function.{ BiConsumer, Function ⇒ JF, Consumer, BiFunction }
9+
import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutorService, ExecutionContextExecutor }
10+
import java.util.concurrent.{ CompletionStage, Executor, ExecutorService }
11+
import java.util.function.Consumer
1112

1213
/**
1314
* This class contains static methods which convert between Java CompletionStage

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44
package scala.compat.java8
55

6-
import language.implicitConversions
76
import java.util.{Optional, OptionalDouble, OptionalInt, OptionalLong}
87

98
/** This class enables bidirectional conversion between `scala.Option` and the

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44
package scala.compat.java8
55

6-
import language.implicitConversions
76
import java.util.{ Iterator => JIterator, PrimitiveIterator }
87

98
/** This class enables conversion from `scala.Iterator` to the set of

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package scala.compat.java8
22

3-
import language.implicitConversions
3+
import scala.language.higherKinds
44

55
import java.util.stream._
66
import scala.compat.java8.collectionImpl._

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package scala.compat.java8.collectionImpl
22

3+
import scala.language.higherKinds
4+
35
/** An `Accumulator` is a low-level collection specialized for gathering
46
* elements in parallel and then joining them in order by merging Accumulators.
57
* Accumulators can contain more than `Int.MaxValue` elements.
@@ -232,7 +234,7 @@ private[java8] class AccumulatorStepper[A](private val acc: Accumulator[A]) exte
232234
private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
233235
private var N = acc.totalSize
234236

235-
private def duplicateSelf(limit: Long = N): AccumulatorStepper[A] = {
237+
private def duplicateSelf(limit: Long): AccumulatorStepper[A] = {
236238
val ans = new AccumulatorStepper(acc)
237239
ans.h = h
238240
ans.i = i
@@ -249,7 +251,7 @@ private[java8] class AccumulatorStepper[A](private val acc: Accumulator[A]) exte
249251
i = 0
250252
}
251253

252-
def characteristics = ORDERED | SIZED | SUBSIZED
254+
def characteristics() = ORDERED | SIZED | SUBSIZED
253255

254256
def estimateSize = N
255257

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package scala.compat.java8.collectionImpl
22

3+
import scala.language.higherKinds
4+
35
/** A `DoubleAccumulator` is a low-level collection specialized for gathering
46
* elements in parallel and then joining them in order by merging them.
57
* This is a manually specialized variant of `Accumulator` with no actual
@@ -229,7 +231,7 @@ private[java8] class DoubleAccumulatorStepper(private val acc: DoubleAccumulator
229231
private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
230232
private var N = acc.totalSize
231233

232-
private def duplicateSelf(limit: Long = N): DoubleAccumulatorStepper = {
234+
private def duplicateSelf(limit: Long): DoubleAccumulatorStepper = {
233235
val ans = new DoubleAccumulatorStepper(acc)
234236
ans.h = h
235237
ans.i = i
@@ -246,7 +248,7 @@ private[java8] class DoubleAccumulatorStepper(private val acc: DoubleAccumulator
246248
i = 0
247249
}
248250

249-
def characteristics = ORDERED | SIZED | SUBSIZED | NONNULL
251+
def characteristics() = ORDERED | SIZED | SUBSIZED | NONNULL
250252

251253
def estimateSize = N
252254

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package scala.compat.java8.collectionImpl
22

3+
import scala.language.higherKinds
4+
35
/** A `IntAccumulator` is a low-level collection specialized for gathering
46
* elements in parallel and then joining them in order by merging them.
57
* This is a manually specialized variant of `Accumulator` with no actual
@@ -236,7 +238,7 @@ private[java8] class IntAccumulatorStepper(private val acc: IntAccumulator) exte
236238
private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
237239
private var N = acc.totalSize
238240

239-
private def duplicateSelf(limit: Long = N): IntAccumulatorStepper = {
241+
private def duplicateSelf(limit: Long): IntAccumulatorStepper = {
240242
val ans = new IntAccumulatorStepper(acc)
241243
ans.h = h
242244
ans.i = i
@@ -253,7 +255,7 @@ private[java8] class IntAccumulatorStepper(private val acc: IntAccumulator) exte
253255
i = 0
254256
}
255257

256-
def characteristics = ORDERED | SIZED | SUBSIZED | NONNULL
258+
def characteristics() = ORDERED | SIZED | SUBSIZED | NONNULL
257259

258260
def estimateSize = N
259261

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package scala.compat.java8.collectionImpl
22

3+
import scala.language.higherKinds
4+
35
/** A `LongAccumulator` is a low-level collection specialized for gathering
46
* elements in parallel and then joining them in order by merging them.
57
* This is a manually specialized variant of `Accumulator` with no actual
@@ -230,7 +232,7 @@ private[java8] class LongAccumulatorStepper(private val acc: LongAccumulator) ex
230232
private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
231233
private var N = acc.totalSize
232234

233-
private def duplicateSelf(limit: Long = N): LongAccumulatorStepper = {
235+
private def duplicateSelf(limit: Long): LongAccumulatorStepper = {
234236
val ans = new LongAccumulatorStepper(acc)
235237
ans.h = h
236238
ans.i = i
@@ -247,7 +249,7 @@ private[java8] class LongAccumulatorStepper(private val acc: LongAccumulator) ex
247249
i = 0
248250
}
249251

250-
def characteristics = ORDERED | SIZED | SUBSIZED | NONNULL
252+
def characteristics() = ORDERED | SIZED | SUBSIZED | NONNULL
251253

252254
def estimateSize = N
253255

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package scala.compat.java8.collectionImpl
22

3+
import scala.language.higherKinds
4+
35
import java.util.Spliterator
46

57
/** A Stepper is a specialized collection that can step through its
@@ -66,7 +68,7 @@ trait StepperLike[@specialized(Double, Int, Long) A, +CC] { self: CC =>
6668
* guaranteed to be any safer than modification of any generic mutable collection, and if the underlying collection is ordered by
6769
* virtue of sorting, `Stepper` will not keep track of that fact.
6870
*/
69-
def characteristics: Int
71+
def characteristics(): Int
7072

7173
/** Returns the size of the collection, if known exactly, or `-1` if not. */
7274
def knownSize: Long

‎src/main/scala/scala/compat/java8/converterImpl/Accumulates.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
4-
53
import scala.compat.java8.collectionImpl._
6-
import scala.compat.java8.runtime._
74

85
trait AccumulatesFromStepper[@specialized(Double, Int, Long) A, Acc <: AccumulatorLike[A, Acc]] {
96
def apply(stepper: Stepper[A]): Acc

‎src/main/scala/scala/compat/java8/converterImpl/MakesSteppers.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
4-
53
import scala.compat.java8.collectionImpl._
6-
import scala.compat.java8.runtime._
74

85
trait MakesStepper[T, +Extra] extends Any {
96
/** Generates a fresh stepper of type `S` for element type `T` */

‎src/main/scala/scala/compat/java8/converterImpl/StepConverters.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ package scala.compat.java8.converterImpl
22

33
import language.implicitConversions
44

5-
import scala.compat.java8.collectionImpl._
6-
import scala.compat.java8.runtime._
7-
8-
import Stepper._
9-
105
trait Priority3StepConverters {
116
implicit def richIterableCanStep[A](underlying: Iterable[A]) = new RichIterableCanStep(underlying)
127
implicit def richMapCanStep[K, V](underlying: collection.Map[K, V]) = new RichMapCanStep[K, V](underlying)

‎src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._
7-
import scala.compat.java8.runtime._
86

97
import Stepper._
108

‎src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
4-
53
import scala.compat.java8.collectionImpl._
64
import scala.compat.java8.runtime._
75

‎src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._

‎src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._

‎src/main/scala/scala/compat/java8/converterImpl/StepsImmHashMap.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._
7-
import scala.compat.java8.runtime._
86

97
import Stepper._
108

‎src/main/scala/scala/compat/java8/converterImpl/StepsImmHashSet.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._
7-
import scala.compat.java8.runtime._
8-
9-
import Stepper._
106

117
/////////////////////////////
128
// Stepper implementations //

‎src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._
7-
import scala.compat.java8.runtime._
86

97
import Stepper._
108

‎src/main/scala/scala/compat/java8/converterImpl/StepsIterable.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._
7-
import scala.compat.java8.runtime._
8-
9-
import Stepper._
106

117
// Iterables just defer to iterator unless they can pattern match something better.
128
// TODO: implement pattern matching!

‎src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._
7-
import scala.compat.java8.runtime._
8-
9-
import Stepper._
106

117
/////////////////////////////
128
// Stepper implementations //

‎src/main/scala/scala/compat/java8/converterImpl/StepsLikeGapped.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import annotation.tailrec
4-
53
import scala.compat.java8.collectionImpl._
64
import Stepper._
75

‎src/main/scala/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import java.util.Spliterator
4-
53
import scala.compat.java8.collectionImpl._
64
import Stepper._
75

‎src/main/scala/scala/compat/java8/converterImpl/StepsLikeIndexed.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import java.util.Spliterator
4-
53
import scala.compat.java8.collectionImpl._
64
import Stepper._
75

‎src/main/scala/scala/compat/java8/converterImpl/StepsLikeIterator.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import java.util.Spliterator
4-
53
import scala.compat.java8.collectionImpl._
64
import Stepper._
75

‎src/main/scala/scala/compat/java8/converterImpl/StepsLikeSliced.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import java.util.Spliterator
4-
53
import scala.compat.java8.collectionImpl._
64
import Stepper._
75

‎src/main/scala/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compat.java8.converterImpl
22

3-
import java.util.Spliterator
4-
53
import scala.compat.java8.collectionImpl._
64
import Stepper._
75

‎src/main/scala/scala/compat/java8/converterImpl/StepsLinearSeq.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package scala.compat.java8.converterImpl
22

3-
import language.implicitConversions
43
import scala.annotation.switch
54

65
import scala.compat.java8.collectionImpl._
7-
import scala.compat.java8.runtime._
86

97
import Stepper._
108

0 commit comments

Comments
 (0)