Skip to content

Update scalafmt-core to 3.10.2 #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Philippus merged 3 commits into from
Nov 26, 2025
Merged

Update scalafmt-core to 3.10.2 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
023ef4d
Update scalafmt-core to 3.10.2
scala-steward Nov 26, 2025
e85201b
Reformat with scalafmt 3.10.2
scala-steward Nov 26, 2025
ddfeddf
Add 'Reformat with scalafmt 3.10.2' to .git-blame-ignore-revs
scala-steward Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.9.7
33326ceb21fb479ef37f76e8beef6c6b1e449a57

# Scala Steward: Reformat with scalafmt 3.10.2
e85201b040700f8ac68b991f82d1c43bb95025fc
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.10.1
version = 3.10.2

align.preset = most
literals.double = Upper
Expand Down
14 changes: 7 additions & 7 deletions src/test/scala/nl/gn0s1s/between/AxiomSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object AxiomSpec extends Properties("Axiom") {
Interval[Instant](p, q).get, // i
Interval[Instant](q, r).get, // j
Interval[Instant](q, s).get, // k
Interval[Instant](t, q).get // l
Interval[Instant](t, q).get // l
)

property("M1: if two periods both meet a third, then any period met by one must also be met by the other.") =
Expand All @@ -40,7 +40,7 @@ object AxiomSpec extends Properties("Axiom") {
Interval[Instant](p, q).get, // i
Interval[Instant](q, r).get, // j
Interval[Instant](s, t).get, // k
Interval[Instant](t, u).get // l
Interval[Instant](t, u).get // l
)

property(
Expand Down Expand Up @@ -71,7 +71,7 @@ object AxiomSpec extends Properties("Axiom") {
r <- Gen.choose(q, Instant.MAX) if q < r
} yield (
Interval[Instant](p, q).get, // i
Interval[Instant](q, r).get // j
Interval[Instant](q, r).get // j
)

property("ML2: if i meets j then j does not meet i") = forAll(genML2) { case (i, j) =>
Expand All @@ -85,7 +85,7 @@ object AxiomSpec extends Properties("Axiom") {
r <- Gen.choose(q, Instant.MAX) if q < r
} yield (
Interval[Instant](p, q).get, // i
Interval[Instant](q, r).get // m
Interval[Instant](q, r).get // m
)

property("ML3: there is no period m such that i:m:i,") = forAll(genML3) { case (i, m) =>
Expand All @@ -101,7 +101,7 @@ object AxiomSpec extends Properties("Axiom") {
} yield (
Interval[Instant](p, q).get, // i
r, // startOfJ
s // endOfK
s // endOfK
)

property("M3: time does not start or stop") = forAll(genM3) { case (i, startOfJ, endOfK) =>
Expand All @@ -121,7 +121,7 @@ object AxiomSpec extends Properties("Axiom") {
Interval[Instant](p, q).get, // i
Interval[Instant](q, r).get, // j
s, // startOfM
t // endOfN
t // endOfN
)

property("M4: if two meets are separated by intervals, then this sequence is a longer interval") = forAll(genM4) {
Expand All @@ -143,7 +143,7 @@ object AxiomSpec extends Properties("Axiom") {
Interval[Instant](p, q).get, // i
Interval[Instant](q, r).get, // j
Interval[Instant](r, s).get, // l
Interval[Instant](q, s).get // k
Interval[Instant](q, s).get // k
)

property("M5: There is only one time period between any two meeting-places.") = forAll(genM5) { case (i, j, l, k) =>
Expand Down