Skip to content

Commit a662c99

Browse files
committed
Bump Scala version to 3.3.0 LTS
1 parent 5f8de10 commit a662c99

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "Advent of Code"
22

3-
scalaVersion := "3.2.1"
3+
scalaVersion := "3.3.0"
44

55
scalacOptions ++= Seq(
66
"-deprecation",
@@ -10,5 +10,5 @@ scalacOptions ++= Seq(
1010
"-unchecked")
1111

1212
libraryDependencies ++= Seq(
13-
"org.scalatest" %% "scalatest" % "3.2.14" % Test
13+
"org.scalatest" %% "scalatest" % "3.2.16" % Test
1414
)

src/main/scala/AdventOfCode2021/Day19.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package AdventOfCode2021
22

3-
import scala.util.control.NonLocalReturns.*
3+
import scala.util.boundary
4+
import scala.util.boundary.break
45

56
object Day19:
67
case class Beacon(x: Int, y: Int, z: Int):
@@ -24,7 +25,7 @@ object Day19:
2425
Scanner(block.trim.split("\n").tail.map(_.trim.split(",").map(_.toInt)).map(a => Beacon(a(0), a(1), a(2))).toSeq)
2526
}
2627

27-
def findMatch(firstScanner: Scanner, candidate: Scanner): Option[(Scanner, Beacon)] = returning {
28+
def findMatch(firstScanner: Scanner, candidate: Scanner): Option[(Scanner, Beacon)] = boundary {
2829
for
2930
secondScanner <- candidate.permutations
3031
if secondScanner.deltas.intersect(firstScanner.deltas).size > 12 * 11
@@ -33,7 +34,7 @@ object Day19:
3334
firstBeacon <- firstScanner.beacons
3435
secondBeacon <- secondScanner.beacons
3536
if secondScanner.beacons.map(_ + firstBeacon - secondBeacon).toSet.intersect(firstScanner.beacons.toSet).size >= 12
36-
do throwReturn(Some((secondScanner, firstBeacon - secondBeacon)))
37+
do break(Some((secondScanner, firstBeacon - secondBeacon)))
3738
None
3839
}
3940

0 commit comments

Comments
 (0)