Skip to content

Commit

Permalink
Merge pull request #1084 from armanbilge/update/scalafmt-3.0.6
Browse files Browse the repository at this point in the history 
Update scalafmt to 3.0.6
  • Loading branch information
@armanbilge
armanbilge authored Oct 20, 2021
2 parents b1b7a68 + a47e8de commit 803b55e
Show file tree
Hide file tree
Showing 363 changed files with 6,640 additions and 1,655 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
- name: Check that workflows are up to date
run: sbt ++${{ matrix.scala }} githubWorkflowCheck

- name: Check formatting
run: sbt ++${{ matrix.scala }} scalafmtCheckAll scalafmtSbtCheck
- name: Check headers+formatting
run: sbt ++${{ matrix.scala }} headerCheckAll scalafmtCheckAll scalafmtSbtCheck

- name: Compile
run: sbt ++${{ matrix.scala }} Test/compile
Expand Down
2 changes: 1 addition & 1 deletion .jvmopts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# see https://weblogs.java.net/blog/kcpeppe/archive/2013/12/11/case-study-jvm-hotspot-flags
-Dfile.encoding=UTF8
-Xms1G
-Xmx3G
-Xmx6G
-XX:ReservedCodeCacheSize=250M
-XX:+TieredCompilation
-XX:-UseGCOverheadLimit
Expand Down
15 changes: 8 additions & 7 deletions .scalafmt.conf
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
version=2.7.5
version=3.0.6
runner.dialect = Scala213Source3
fileOverride {
"glob:**/scala-3/**" {
runner.dialect = scala3
}
}
align.openParenCallSite = true
align.openParenDefnSite = true
maxColumn = 120
continuationIndent.defnSite = 2
assumeStandardLibraryStripMargin = true
danglingParentheses = true
danglingParentheses.preset = true
rewrite.rules = [AvoidInfix, SortImports, RedundantParens, SortModifiers]
docstrings = JavaDoc
newlines.afterCurlyLambda = preserve
docstrings.style = Asterisk
docstrings.oneline = unfold
project.excludeFilters = [
"core/src/main/scala-3",
"util/src/main/scala-3" ,
"macros/src/main/scala-3"
]
15 changes: 15 additions & 0 deletions benchmark/src/main/java/spire/benchmark/JavaFib.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire.benchmark;

import java.math.*;
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala-2/spire/benchmark/CForBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala-2/spire/benchmark/FpFilterBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/AddBenchmarks.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/ArrayOrderBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/Arrays.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire.benchmark

import org.openjdk.jmh.annotations.{Scope, Setup, State}
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/BigIntRational.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/CheckedBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark
/*
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/ComplexAddBenchmarks.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark.jmh
// import java.util.concurrent.TimeUnit
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/FastForBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/FibBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/GcdBenchmarks.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/JuliaBenchmarks.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark
import spire.implicits._
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/LongRational.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark

Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/MapSemigroupBenchmarks.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark
/*
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/NaturalBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark
/*
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/PolynomialBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark
/*
Expand Down
15 changes: 15 additions & 0 deletions benchmark/src/main/scala/spire/benchmark/PowBenchmark.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* **********************************************************************\
* * Project **
* * ______ ______ __ ______ ____ **
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
* * / /__ / /_/ / / / / /_/ / / /_ **
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
* * ____/ / / / / / / / | | / /__ **
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
* * **
* * Redistribution and use permitted under the MIT license. **
* * **
* \***********************************************************************
*/

package spire
package benchmark
/*
Expand Down
Loading

0 comments on commit 803b55e

Please sign in to comment.