Skip to content

Commit 803b55e

Browse files
armanbilgearmanbilge
authored
Merge pull request #1084 from armanbilge/update/scalafmt-3.0.6
Update scalafmt to 3.0.6
2 parents b1b7a68 + a47e8de commit 803b55e

363 files changed

Lines changed: 6640 additions & 1655 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
- name: Check that workflows are up to date
5353
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
5454

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

5858
- name: Compile
5959
run: sbt ++${{ matrix.scala }} Test/compile

‎.jvmopts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# see https://weblogs.java.net/blog/kcpeppe/archive/2013/12/11/case-study-jvm-hotspot-flags
22
-Dfile.encoding=UTF8
33
-Xms1G
4-
-Xmx3G
4+
-Xmx6G
55
-XX:ReservedCodeCacheSize=250M
66
-XX:+TieredCompilation
77
-XX:-UseGCOverheadLimit

‎.scalafmt.conf‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
version=2.7.5
1+
version=3.0.6
2+
runner.dialect = Scala213Source3
3+
fileOverride {
4+
"glob:**/scala-3/**" {
5+
runner.dialect = scala3
6+
}
7+
}
28
align.openParenCallSite = true
39
align.openParenDefnSite = true
410
maxColumn = 120
511
continuationIndent.defnSite = 2
612
assumeStandardLibraryStripMargin = true
7-
danglingParentheses = true
13+
danglingParentheses.preset = true
814
rewrite.rules = [AvoidInfix, SortImports, RedundantParens, SortModifiers]
915
docstrings = JavaDoc
1016
newlines.afterCurlyLambda = preserve
1117
docstrings.style = Asterisk
1218
docstrings.oneline = unfold
13-
project.excludeFilters = [
14-
"core/src/main/scala-3",
15-
"util/src/main/scala-3" ,
16-
"macros/src/main/scala-3"
17-
]

‎benchmark/src/main/java/spire/benchmark/JavaFib.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* **********************************************************************\
3+
* * Project **
4+
* * ______ ______ __ ______ ____ **
5+
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
6+
* * / /__ / /_/ / / / / /_/ / / /_ **
7+
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
8+
* * ____/ / / / / / / / | | / /__ **
9+
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
10+
* * **
11+
* * Redistribution and use permitted under the MIT license. **
12+
* * **
13+
* \***********************************************************************
14+
*/
15+
116
package spire.benchmark;
217

318
import java.math.*;

‎benchmark/src/main/scala-2/spire/benchmark/CForBenchmark.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* **********************************************************************\
3+
* * Project **
4+
* * ______ ______ __ ______ ____ **
5+
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
6+
* * / /__ / /_/ / / / / /_/ / / /_ **
7+
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
8+
* * ____/ / / / / / / / | | / /__ **
9+
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
10+
* * **
11+
* * Redistribution and use permitted under the MIT license. **
12+
* * **
13+
* \***********************************************************************
14+
*/
15+
116
package spire
217
package benchmark
318

‎benchmark/src/main/scala-2/spire/benchmark/FpFilterBenchmark.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* **********************************************************************\
3+
* * Project **
4+
* * ______ ______ __ ______ ____ **
5+
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
6+
* * / /__ / /_/ / / / / /_/ / / /_ **
7+
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
8+
* * ____/ / / / / / / / | | / /__ **
9+
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
10+
* * **
11+
* * Redistribution and use permitted under the MIT license. **
12+
* * **
13+
* \***********************************************************************
14+
*/
15+
116
package spire
217
package benchmark
318

‎benchmark/src/main/scala/spire/benchmark/AddBenchmarks.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* **********************************************************************\
3+
* * Project **
4+
* * ______ ______ __ ______ ____ **
5+
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
6+
* * / /__ / /_/ / / / / /_/ / / /_ **
7+
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
8+
* * ____/ / / / / / / / | | / /__ **
9+
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
10+
* * **
11+
* * Redistribution and use permitted under the MIT license. **
12+
* * **
13+
* \***********************************************************************
14+
*/
15+
116
package spire
217
package benchmark
318

‎benchmark/src/main/scala/spire/benchmark/ArrayOrderBenchmark.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* **********************************************************************\
3+
* * Project **
4+
* * ______ ______ __ ______ ____ **
5+
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
6+
* * / /__ / /_/ / / / / /_/ / / /_ **
7+
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
8+
* * ____/ / / / / / / / | | / /__ **
9+
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
10+
* * **
11+
* * Redistribution and use permitted under the MIT license. **
12+
* * **
13+
* \***********************************************************************
14+
*/
15+
116
package spire
217
package benchmark
318

‎benchmark/src/main/scala/spire/benchmark/Arrays.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* **********************************************************************\
3+
* * Project **
4+
* * ______ ______ __ ______ ____ **
5+
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
6+
* * / /__ / /_/ / / / / /_/ / / /_ **
7+
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
8+
* * ____/ / / / / / / / | | / /__ **
9+
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
10+
* * **
11+
* * Redistribution and use permitted under the MIT license. **
12+
* * **
13+
* \***********************************************************************
14+
*/
15+
116
package spire.benchmark
217

318
import org.openjdk.jmh.annotations.{Scope, Setup, State}

‎benchmark/src/main/scala/spire/benchmark/BigIntRational.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* **********************************************************************\
3+
* * Project **
4+
* * ______ ______ __ ______ ____ **
5+
* * / ____/ / __ / / / / __ / / __/ (c) 2011-2021 **
6+
* * / /__ / /_/ / / / / /_/ / / /_ **
7+
* * /___ / / ____/ / / / __ / / __/ Erik Osheim, Tom Switzer **
8+
* * ____/ / / / / / / / | | / /__ **
9+
* * /_____/ /_/ /_/ /_/ |_| /____/ All rights reserved. **
10+
* * **
11+
* * Redistribution and use permitted under the MIT license. **
12+
* * **
13+
* \***********************************************************************
14+
*/
15+
116
package spire
217
package benchmark
318

0 commit comments

Comments
 (0)