Rewrite all remaining package declarations.

We are all spire residents now.
typelevel · Nov 5, 2015 · c621c1c · c621c1c
1 parent 5c3e91e
commit c621c1c
Show file tree

Hide file tree

Showing 145 changed files with 292 additions and 147 deletions.
diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/ComplexState.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/ComplexState.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import org.openjdk.jmh.annotations._
 import spire.math.Complex

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/DoubleState.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/DoubleState.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import org.openjdk.jmh.annotations.{Scope, Setup, State}
 

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/FastComplexState.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/FastComplexState.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import org.openjdk.jmh.annotations.{Scope, Setup, State}
 import spire.math.FastComplex

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/FloatState.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/FloatState.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import org.openjdk.jmh.annotations.{Scope, Setup, State}
 

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/IntState.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/IntState.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import org.openjdk.jmh.annotations.{Scope, Setup, State}
 

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/LongState.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/LongState.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import org.openjdk.jmh.annotations.{Scope, Setup, State}
 

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/RationalBenchmarks.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/RationalBenchmarks.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import java.util.concurrent.TimeUnit
 
@@ -144,4 +145,4 @@ class RationalCompareBenchmark {
   def compare(x: Blackhole): Unit = {
     x.consume(a compare b)
   }
-}
+}
diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/SafeLongBenchmarks.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/SafeLongBenchmarks.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import java.util.concurrent.TimeUnit
 

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/StateSupport.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/StateSupport.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import spire.benchmark.FixtureSupport
 

diff --git a/benchmark-jmh/src/main/scala/spire/benchmark/jmh/StrictEqBenchmarks.scala b/benchmark-jmh/src/main/scala/spire/benchmark/jmh/StrictEqBenchmarks.scala
@@ -1,4 +1,5 @@
-package spire.benchmark.jmh
+package spire
+package benchmark.jmh
 
 import java.util.concurrent.TimeUnit
 

diff --git a/benchmark/src/main/scala/spire/benchmark/BigIntRational.scala b/benchmark/src/main/scala/spire/benchmark/BigIntRational.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 object BigIntRational {
   val Zero = new BigIntRational(0, 1)

diff --git a/benchmark/src/main/scala/spire/benchmark/CheckedBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/CheckedBenchmark.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 import scala.util.Random
 import spire.macros.Checked

diff --git a/benchmark/src/main/scala/spire/benchmark/FpFilterBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/FpFilterBenchmark.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 import com.google.caliper.Param
 

diff --git a/benchmark/src/main/scala/spire/benchmark/LongRational.scala b/benchmark/src/main/scala/spire/benchmark/LongRational.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 import spire.implicits._
 

diff --git a/benchmark/src/main/scala/spire/benchmark/MapSemigroupBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/MapSemigroupBenchmarks.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 import spire.algebra._
 import spire.implicits._

diff --git a/benchmark/src/main/scala/spire/benchmark/MergeBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/MergeBenchmark.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 import spire.implicits._
 import spire.math.Rational

diff --git a/benchmark/src/main/scala/spire/benchmark/PolynomialBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/PolynomialBenchmark.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 import scala.util.Random
 import Random._

diff --git a/benchmark/src/main/scala/spire/benchmark/RandomBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/RandomBenchmark.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 
 import spire.implicits._

diff --git a/benchmark/src/main/scala/spire/benchmark/SieveBenchmark.scala b/benchmark/src/main/scala/spire/benchmark/SieveBenchmark.scala
@@ -1,4 +1,5 @@
-package spire.benchmark
+package spire
+package benchmark
 
 import spire.math.prime._
 import scala.util.{Success, Try}

diff --git a/benchmark/src/main/scala/spire/benchmark/ZigguratBenchmarks.scala b/benchmark/src/main/scala/spire/benchmark/ZigguratBenchmarks.scala
@@ -12,7 +12,8 @@
 \************************************************************************/
 
 
-package spire.benchmark
+package spire
+package benchmark
 
 import spire.implicits._
 

diff --git a/core/shared/src/main/scala/spire/algebra/Sign.scala b/core/shared/src/main/scala/spire/algebra/Sign.scala
@@ -1,4 +1,5 @@
-package spire.algebra
+package spire
+package algebra
 
 /**
  * A simple ADT representing the `Sign` of an object.

diff --git a/core/shared/src/main/scala/spire/algebra/free/FreeGroup.scala b/core/shared/src/main/scala/spire/algebra/free/FreeGroup.scala
@@ -1,4 +1,5 @@
-package spire.algebra
+package spire
+package algebra
 package free
 
 final class FreeGroup[A] private (val terms: Vector[Either[A, A]]) extends AnyVal { lhs =>

diff --git a/core/shared/src/main/scala/spire/algebra/free/FreeMonoid.scala b/core/shared/src/main/scala/spire/algebra/free/FreeMonoid.scala
@@ -1,4 +1,5 @@
-package spire.algebra
+package spire
+package algebra
 package free
 
 final class FreeMonoid[A] private (val terms: List[A]) extends AnyVal { lhs =>

diff --git a/core/shared/src/main/scala/spire/algebra/partial/Groupoid.scala b/core/shared/src/main/scala/spire/algebra/partial/Groupoid.scala
@@ -1,4 +1,5 @@
-package spire.algebra
+package spire
+package algebra
 package partial
 
 import spire.util.Opt

diff --git a/core/shared/src/main/scala/spire/algebra/partial/PartialAction.scala b/core/shared/src/main/scala/spire/algebra/partial/PartialAction.scala
@@ -1,4 +1,5 @@
-package spire.algebra
+package spire
+package algebra
 package partial
 
 import spire.util.Opt

diff --git a/core/shared/src/main/scala/spire/algebra/partial/Semigroupoid.scala b/core/shared/src/main/scala/spire/algebra/partial/Semigroupoid.scala
@@ -1,4 +1,5 @@
-package spire.algebra
+package spire
+package algebra
 package partial
 
 import spire.util.Opt

diff --git a/core/shared/src/main/scala/spire/macros/Auto.scala b/core/shared/src/main/scala/spire/macros/Auto.scala
@@ -1,4 +1,5 @@
-package spire.macros
+package spire
+package macros
 
 import language.experimental.macros
 

diff --git a/core/shared/src/main/scala/spire/macros/Macros.scala b/core/shared/src/main/scala/spire/macros/Macros.scala
@@ -1,4 +1,5 @@
-package spire.macros
+package spire
+package macros
 
 import spire.algebra.{Field, Ring}
 import spire.macros.compat.Context

diff --git a/core/shared/src/main/scala/spire/macros/fpf/Cmp.scala b/core/shared/src/main/scala/spire/macros/fpf/Cmp.scala
@@ -1,4 +1,5 @@
-package spire.macros.fpf
+package spire
+package macros.fpf
 
 private[spire] sealed trait Cmp
 private[spire] object Cmp {

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,4 +1,5 @@
-package spire.macros.fpf
+package spire
+package macros.fpf
 
 import scala.language.experimental.macros
 

diff --git a/core/shared/src/main/scala/spire/math/FpFilter.scala b/core/shared/src/main/scala/spire/math/FpFilter.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import scala.language.experimental.macros
 

diff --git a/core/shared/src/main/scala/spire/math/Interval.scala b/core/shared/src/main/scala/spire/math/Interval.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import Predef.{any2stringadd => _, _}
 

diff --git a/core/shared/src/main/scala/spire/math/Number.scala b/core/shared/src/main/scala/spire/math/Number.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import scala.math.{ScalaNumber, ScalaNumericConversions}
 import java.lang.Math

diff --git a/core/shared/src/main/scala/spire/math/NumberTag.scala b/core/shared/src/main/scala/spire/math/NumberTag.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 object NumberTag {
 

diff --git a/core/shared/src/main/scala/spire/math/ScalaWrappers.scala b/core/shared/src/main/scala/spire/math/ScalaWrappers.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import spire.algebra.{Eq, EuclideanRing, Field, PartialOrder, Order, Ring, Signed}
 

diff --git a/core/shared/src/main/scala/spire/math/Trilean.scala b/core/shared/src/main/scala/spire/math/Trilean.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import spire.algebra.lattice.Heyting
 

diff --git a/core/shared/src/main/scala/spire/math/UByte.scala b/core/shared/src/main/scala/spire/math/UByte.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import spire.algebra.{IsIntegral, Order, Rig, Signed}
 

diff --git a/core/shared/src/main/scala/spire/math/UInt.scala b/core/shared/src/main/scala/spire/math/UInt.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import spire.algebra.{IsIntegral, Order, Rig, Signed}
 

diff --git a/core/shared/src/main/scala/spire/math/UShort.scala b/core/shared/src/main/scala/spire/math/UShort.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 
 import spire.algebra.{IsIntegral, Order, Rig, Signed}
 

diff --git a/core/shared/src/main/scala/spire/math/interval/Bound.scala b/core/shared/src/main/scala/spire/math/interval/Bound.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 package interval
 
 import spire.syntax.order._

diff --git a/core/shared/src/main/scala/spire/math/poly/RootFinder.scala b/core/shared/src/main/scala/spire/math/poly/RootFinder.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 package poly
 
 import java.math.MathContext

diff --git a/core/shared/src/main/scala/spire/math/poly/RootIsolator.scala b/core/shared/src/main/scala/spire/math/poly/RootIsolator.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 package poly
 
 import spire.std.bigInt._

diff --git a/core/shared/src/main/scala/spire/math/poly/Roots.scala b/core/shared/src/main/scala/spire/math/poly/Roots.scala
@@ -1,4 +1,5 @@
-package spire.math
+package spire
+package math
 package poly
 
 import java.math.{ RoundingMode, MathContext }

diff --git a/core/shared/src/main/scala/spire/math/prime/BitSet.scala b/core/shared/src/main/scala/spire/math/prime/BitSet.scala
@@ -1,4 +1,5 @@
-package spire.math.prime
+package spire
+package math.prime
 
 import spire.syntax.cfor._
 

diff --git a/core/shared/src/main/scala/spire/math/prime/FactorHeap.scala b/core/shared/src/main/scala/spire/math/prime/FactorHeap.scala
@@ -1,4 +1,5 @@
-package spire.math.prime
+package spire
+package math.prime
 
 import SieveUtil._
 

diff --git a/core/shared/src/main/scala/spire/math/prime/SieveUtil.scala b/core/shared/src/main/scala/spire/math/prime/SieveUtil.scala
@@ -1,4 +1,5 @@
-package spire.math.prime
+package spire
+package math.prime
 
 import spire.math.SafeLong
 

diff --git a/core/shared/src/main/scala/spire/math/prime/Siever.scala b/core/shared/src/main/scala/spire/math/prime/Siever.scala
@@ -1,4 +1,5 @@
-package spire.math.prime
+package spire
+package math.prime
 
 import spire.math.{SafeLong, log, max}
 

diff --git a/core/shared/src/main/scala/spire/optional/intervalGeometricPartialOrder.scala b/core/shared/src/main/scala/spire/optional/intervalGeometricPartialOrder.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import spire.algebra._
 import spire.math.Interval

diff --git a/core/shared/src/main/scala/spire/optional/intervalRangedPartialOrder.scala b/core/shared/src/main/scala/spire/optional/intervalRangedPartialOrder.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import spire.algebra.{Order, PartialOrder}
 import spire.math.{Interval, Point}

diff --git a/core/shared/src/main/scala/spire/optional/intervalSubsetPartialOrder.scala b/core/shared/src/main/scala/spire/optional/intervalSubsetPartialOrder.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import spire.algebra.{Order, PartialOrder}
 import spire.math.Interval

diff --git a/core/shared/src/main/scala/spire/optional/mapIntIntPermutation.scala b/core/shared/src/main/scala/spire/optional/mapIntIntPermutation.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import scala.collection.SeqLike
 import scala.collection.generic.CanBuildFrom

diff --git a/core/shared/src/main/scala/spire/optional/partialIterable.scala b/core/shared/src/main/scala/spire/optional/partialIterable.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import scala.collection.IterableLike
 import scala.collection.generic.CanBuildFrom

diff --git a/core/shared/src/main/scala/spire/optional/powerSetPartialOrder.scala b/core/shared/src/main/scala/spire/optional/powerSetPartialOrder.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import spire.algebra.PartialOrder
 

diff --git a/core/shared/src/main/scala/spire/optional/rationalTrig.scala b/core/shared/src/main/scala/spire/optional/rationalTrig.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import spire.algebra.Trig
 import spire.math.Rational

diff --git a/core/shared/src/main/scala/spire/optional/totalFloat.scala b/core/shared/src/main/scala/spire/optional/totalFloat.scala
@@ -1,4 +1,5 @@
-package spire.optional
+package spire
+package optional
 
 import java.lang.Math