Merge pull request #588 from non/topic/cleanup

Cleaned up imports.
typelevel · Oct 10, 2016 · 6beb315 · 6beb315
2 parents 8cd85fe + c193cda
commit 6beb315
Show file tree

Hide file tree

Showing 73 changed files with 46 additions and 189 deletions.
diff --git a/benchmark/src/main/scala/spire/benchmark/AddBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/AddBenchmarks.scala
@@ -1,20 +1,10 @@
 package spire
 package benchmark
 
-
-import scala.util.Random
-
 import spire.algebra._
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
-import java.lang.Math
-import java.math.BigInteger
-
 object AddBenchmarks extends MyRunner(classOf[AddBenchmarks])
 
 class AddBenchmarks extends MyBenchmark with BenchmarkData {

diff --git a/benchmark/src/main/scala/spire/benchmark/AnyValAddBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/AnyValAddBenchmarks.scala
@@ -7,8 +7,6 @@ import Random._
 import spire.algebra._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object AnyValAddBenchmarks extends MyRunner(classOf[AnyValAddBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/AnyValSubtractBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/AnyValSubtractBenchmarks.scala
@@ -7,8 +7,6 @@ import Random._
 import spire.algebra._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object AnyValSubtractBenchmarks extends MyRunner(cls = classOf[AnyValSubtractBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/ArrayOrderBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/ArrayOrderBenchmark.scala
@@ -8,8 +8,6 @@ import Random._
 import spire.algebra._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object ArrayOrderBenchmarks extends MyRunner(classOf[ArrayOrderBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/Benchmark.scala b/benchmark/src/main/scala/spire/benchmark/Benchmark.scala
@@ -9,10 +9,6 @@ import spire.math._
 
 import com.google.caliper.Runner
 import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
-import java.lang.Math
-import java.math.BigInteger
 
 /**
  * Extend this to create an actual benchmarking class.

diff --git a/benchmark/src/main/scala/spire/benchmark/CForBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/CForBenchmark.scala
@@ -4,8 +4,6 @@ package benchmark
 import scala.util.Random
 import Random._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 import spire.syntax.cfor._

diff --git a/benchmark/src/main/scala/spire/benchmark/CheckedBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/CheckedBenchmark.scala
@@ -1,10 +1,7 @@
 package spire
 package benchmark
 
-import scala.util.Random
 import spire.macros.Checked
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object CheckedBenchmarks extends MyRunner(classOf[CheckedBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/ComplexAddBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/ComplexAddBenchmarks.scala
@@ -8,8 +8,6 @@ import spire.algebra._
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object ComplexAddBenchmarks extends MyRunner(classOf[ComplexAddBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/FibBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/FibBenchmark.scala
@@ -1,20 +1,11 @@
 package spire
 package benchmark
 
-
-import scala.util.Random
-
 import spire.algebra._
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
-import java.lang.Math
 import java.math.BigInteger
-import java.lang.Long.numberOfTrailingZeros
 
 object BigIntegerIsRig extends Rig[BigInteger] {
   def zero: BigInteger = new BigInteger("0")

diff --git a/benchmark/src/main/scala/spire/benchmark/GcdBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/GcdBenchmarks.scala
@@ -7,10 +7,6 @@ import Random._
 
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
 import java.lang.Math
 import java.math.BigInteger
 import java.lang.Long.numberOfTrailingZeros

diff --git a/benchmark/src/main/scala/spire/benchmark/JuliaBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/JuliaBenchmarks.scala
@@ -1,15 +1,9 @@
 package spire
 package benchmark
 
-import scala.util.Random
-
 import spire.implicits._
 import spire.math._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
 object JuliaBenchmarks extends MyRunner(classOf[JuliaBenchmarks])
 
 class JuliaBenchmarks extends MyBenchmark {

diff --git a/benchmark/src/main/scala/spire/benchmark/MapSemigroupBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/MapSemigroupBenchmarks.scala
@@ -4,7 +4,7 @@ package benchmark
 import spire.algebra._
 import spire.implicits._
 
-import com.google.caliper.{ Runner, SimpleBenchmark, Param }
+import com.google.caliper.Param
 
 import scala.util.Random._
 

diff --git a/benchmark/src/main/scala/spire/benchmark/Mo5Benchmarks.scala b/benchmark/src/main/scala/spire/benchmark/Mo5Benchmarks.scala
@@ -8,10 +8,6 @@ import Random._
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
 object Mo5Benchmarks extends MyRunner(classOf[Mo5Benchmarks])
 
 class Mo5Benchmarks extends MyBenchmark {

diff --git a/benchmark/src/main/scala/spire/benchmark/NaturalBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/NaturalBenchmark.scala
@@ -7,8 +7,6 @@ import scala.util.Random
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 import java.lang.Math

diff --git a/benchmark/src/main/scala/spire/benchmark/PolynomialBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/PolynomialBenchmark.scala
@@ -7,9 +7,8 @@ import Random._
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.{ Runner, SimpleBenchmark, Param }
+import com.google.caliper.Param
 import org.apache.commons.math3.analysis.polynomials._
-import org.apache.commons.math3.analysis.UnivariateFunction
 
 object PolynomialBenchmarks extends MyRunner(classOf[PolynomialBenchmarks])
 

diff --git a/benchmark/src/main/scala/spire/benchmark/PowBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/PowBenchmark.scala
@@ -7,14 +7,6 @@ import Random._
 
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
-import java.lang.Math
-import java.math.BigInteger
-import java.lang.Long.numberOfTrailingZeros
-
 object PowBenchmarks extends MyRunner(classOf[PowBenchmarks])
 
 class PowBenchmarks extends MyBenchmark {

diff --git a/benchmark/src/main/scala/spire/benchmark/RandomBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/RandomBenchmark.scala
@@ -1,13 +1,8 @@
 package spire
 package benchmark
 
-
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
-import com.google.caliper.Param
-
 object RandomBenchmarks extends MyRunner(classOf[RandomBenchmarks])
 
 class RandomBenchmarks extends MyBenchmark with BenchmarkData {

diff --git a/benchmark/src/main/scala/spire/benchmark/RatComparisonBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/RatComparisonBenchmark.scala
@@ -7,8 +7,6 @@ import Random._
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 import org.apfloat._

diff --git a/benchmark/src/main/scala/spire/benchmark/RationalBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/RationalBenchmarks.scala
@@ -7,13 +7,8 @@ import scala.util.Random
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
-import java.lang.Math
-import java.math.BigInteger
-
 object RationalBenchmarks extends MyRunner(classOf[RationalBenchmarks])
 
 class RationalBenchmarks extends MyBenchmark with BenchmarkData {

diff --git a/benchmark/src/main/scala/spire/benchmark/RexBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/RexBenchmark.scala
@@ -6,8 +6,6 @@ import spire.implicits._
 import spire.math._
 
 import scala.util.Random._
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object RexBenchmarks extends MyRunner(classOf[RexBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/ScalaVsSpire.scala b/benchmark/src/main/scala/spire/benchmark/ScalaVsSpire.scala
@@ -7,11 +7,8 @@ import Random._
 import spire.algebra._
 import spire.std.any._
 
-import spire.math.{Numeric => SpireN}
 import scala.math.{Numeric => ScalaN}
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object ScalaVsSpireBenchmarks extends MyRunner(classOf[ScalaVsSpireBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/SelectionBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/SelectionBenchmarks.scala
@@ -9,8 +9,6 @@ import spire.algebra._
 import spire.math._
 import spire.implicits._
 
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object SelectionBenchmarks extends MyRunner(classOf[SelectionBenchmarks])

diff --git a/benchmark/src/main/scala/spire/benchmark/SortingBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/SortingBenchmarks.scala
@@ -9,11 +9,6 @@ import spire.algebra._
 import spire.math._
 import spire.implicits._
 
-import spire.math.{Numeric => SpireN}
-import scala.math.{Numeric => ScalaN}
-
-import com.google.caliper.Runner
-import com.google.caliper.SimpleBenchmark
 import com.google.caliper.Param
 
 object SortingBenchmarks extends MyRunner(classOf[SortingBenchmarks])

diff --git a/core/shared/src/main/scala/spire/algebra/NRoot.scala b/core/shared/src/main/scala/spire/algebra/NRoot.scala
@@ -23,8 +23,6 @@ trait NRoot[@sp(Double,Float,Int,Long) A] extends Any {
   def fpow(a:A, b:A): A
 }
 
-import spire.math.{ConvertableTo, ConvertableFrom, Number}
-
 object NRoot {
   @inline final def apply[@sp(Int,Long,Float,Double) A](implicit ev:NRoot[A]): NRoot[A] = ev
 

diff --git a/core/shared/src/main/scala/spire/compat.scala b/core/shared/src/main/scala/spire/compat.scala
@@ -1,8 +1,8 @@
 package spire
 
 import spire.algebra.{Eq, EuclideanRing, Field, PartialOrder, Order, Ring, Signed}
-import spire.math.{ConvertableFrom, ConvertableTo}
-import spire.math.{ScalaEquivWrapper, ScalaFractionalWrapper, ScalaIntegralWrapper, ScalaNumericWrapper, ScalaPartialOrderingWrapper, ScalaOrderingWrapper}
+import spire.math.{ConvertableFrom, ScalaEquivWrapper, ScalaFractionalWrapper}
+import spire.math.{ScalaIntegralWrapper, ScalaNumericWrapper, ScalaPartialOrderingWrapper, ScalaOrderingWrapper}
 
 private[spire] trait CompatPriority1 {
   implicit def numeric[A: Ring: ConvertableFrom: Signed: Order]: scala.math.Numeric[A] =

diff --git a/core/shared/src/main/scala/spire/macros/Auto.scala b/core/shared/src/main/scala/spire/macros/Auto.scala
@@ -200,15 +200,18 @@ abstract class AutoAlgebra extends AutoOps { ops =>
 }
 
 case class ScalaAlgebra[C <: Context](c: C) extends AutoAlgebra {
-  def plusplus[A]: c.Expr[A] = binop[A]("$plus$plus")
-  def plus[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$plus")
-  def minus[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$minus")
-  def times[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$times")
-  def negate[A: c.WeakTypeTag]: c.Expr[A] = unop[A]("unary_$minus")
-  def quot[A: c.WeakTypeTag]: c.Expr[A] = binopSearch[A]("quot" :: "$div" :: Nil) getOrElse failedSearch("quot", "/~")
-  def div[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$div")
-  def mod[A: c.WeakTypeTag](stub: => c.Expr[A]): c.Expr[A] = binop[A]("$percent")
-  def equals: c.Expr[Boolean] = binop[Boolean]("$eq$eq")
+  // we munge these names with dollar signs in them to avoid getting
+  // warnings about possible interpolations. these are not intended to
+  // be interpolations.
+  def plusplus[A]: c.Expr[A] = binop[A]("$" + "plus" + "$" + "plus")
+  def plus[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$" + "plus")
+  def minus[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$" + "minus")
+  def times[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$" + "times")
+  def negate[A: c.WeakTypeTag]: c.Expr[A] = unop[A]("unary_" + "$" + "minus")
+  def quot[A: c.WeakTypeTag]: c.Expr[A] = binopSearch[A]("quot" :: ("$" + "div") :: Nil) getOrElse failedSearch("quot", "/~")
+  def div[A: c.WeakTypeTag]: c.Expr[A] = binop[A]("$" + "div")
+  def mod[A: c.WeakTypeTag](stub: => c.Expr[A]): c.Expr[A] = binop[A]("$" + "percent")
+  def equals: c.Expr[Boolean] = binop[Boolean]("$" + "eq" + "$" + "eq")
   def compare: c.Expr[Int] = binop[Int]("compare")
 }
 

diff --git a/core/shared/src/main/scala/spire/macros/fpf/Fuser.scala b/core/shared/src/main/scala/spire/macros/fpf/Fuser.scala
@@ -1,8 +1,6 @@
 package spire
 package macros.fpf
 
-import scala.language.experimental.macros
-
 import spire.macros.compat.{freshTermName, resetLocalAttrs, typeCheck, Context}
 import spire.math.{FpFilter, FpFilterApprox, FpFilterExact}
 

diff --git a/core/shared/src/main/scala/spire/math/Algebraic.scala b/core/shared/src/main/scala/spire/math/Algebraic.scala
@@ -39,7 +39,7 @@ import spire.syntax.std.seq._
 @SerialVersionUID(1L)
 final class Algebraic private (val expr: Algebraic.Expr)
 extends ScalaNumber with ScalaNumericConversions with Serializable {
-  import Algebraic.{ One, Expr, MinIntValue, MaxIntValue, MinLongValue, MaxLongValue, JBigDecimalOrder, roundExact }
+  import Algebraic.{ One, Expr, MinIntValue, MaxIntValue, MinLongValue, MaxLongValue, roundExact }
 
   /**
    * Returns an `Int` with the same sign as this algebraic number. Algebraic

diff --git a/core/shared/src/main/scala/spire/math/BitString.scala b/core/shared/src/main/scala/spire/math/BitString.scala
@@ -3,8 +3,6 @@ package math
 
 import spire.algebra.Bool
 
-import java.lang.Math
-
 trait BitString[@sp(Byte, Short, Int, Long) A] extends Any with Bool[A] {
   def signed: Boolean
   def width: Int

diff --git a/core/shared/src/main/scala/spire/math/Complex.scala b/core/shared/src/main/scala/spire/math/Complex.scala
@@ -8,9 +8,7 @@ import spire.syntax.isReal._
 import spire.syntax.nroot._
 import spire.syntax.order._
 
-import scala.math.{ScalaNumber, ScalaNumericConversions, ScalaNumericAnyConversions}
-import java.lang.Math
-
+import scala.math.{ScalaNumber, ScalaNumericConversions}
 
 object Complex extends ComplexInstances {
   def i[@sp(Float, Double) T](implicit T: Rig[T]): Complex[T] =
@@ -435,7 +433,7 @@ class FloatComplex(val u: Long) extends AnyVal {
  * Not bad, eh?
  */
 object FastComplex {
-  import java.lang.Math.{atan2, cos, sin, sqrt}
+  import java.lang.Math.{atan2, cos, sin}
 
   // note the superstitious use of @inline and final everywhere
 

diff --git a/core/shared/src/main/scala/spire/math/Convertable.scala b/core/shared/src/main/scala/spire/math/Convertable.scala
@@ -3,9 +3,6 @@ package math
 
 import java.math.MathContext
 
-
-import spire.algebra.{ Trig, IsReal }
-
 trait ConvertableTo[@sp A] extends Any {
   def fromByte(n: Byte): A
   def fromShort(n: Short): A

diff --git a/core/shared/src/main/scala/spire/math/Fractional.scala b/core/shared/src/main/scala/spire/math/Fractional.scala
@@ -4,8 +4,6 @@ package math
 import spire.algebra.{Field, NRoot}
 import spire.std._
 
-import java.lang.Math
-
 trait Fractional[@sp(Float, Double) A] extends Any with Field[A] with NRoot[A] with Integral[A]
 
 object Fractional {

diff --git a/core/shared/src/main/scala/spire/math/Natural.scala b/core/shared/src/main/scala/spire/math/Natural.scala
@@ -168,8 +168,6 @@ sealed abstract class Natural extends ScalaNumber with ScalaNumericConversions w
   def isEven: Boolean = (digit & UInt(1)) == UInt(0)
 
   def powerOfTwo: Int = {
-    import java.lang.Integer.highestOneBit
-
     def test(n: UInt): Int = {
       if ((n.signed & -n.signed) != n.signed) return -1
       // TODO: this could be better/faster