Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 215ad70

Browse files
elootseloots
authored
Bump Scala 3.0.0-M1/Remove workaround/Correct extensions syntax (#70)
* Bump Dotty version to Scala 3.0.0-M1/Remove workaround/Correct extensions syntax - Dotty 0.27.0-RC1 broke logging calls due to [Ambiguous overload between varargs and non-varargs #9688](scala/scala3#9688) which was fixed in [Fix vararg overloading #9732](scala/scala3#9732) - Remove a few remaining extension methods that still used an 'older' extension mothod syntax * Update exercise instructions - Exercise on extentions still used a syntax that has since then been changed - Use indentation based syntax in instructions
1 parent c7d4e3a commit 215ad70

File tree

32 files changed

+54
-102
lines changed

32 files changed

+54
-102
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ collectedLogs.zip
99
.vscode
1010
*.code-workspace
1111

12-
# Metals/Bloop specific
12+
# Metals/Bloop/sbt BSP specific
1313
.bloop/
1414
.metals/
1515
.swp

‎exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class SudokuProgressTracker private (
4040
case NewUpdatesInFlight(updateCount) =>
4141
trackProgress(updatesInFlight + updateCount)
4242
case msg: SudokuDetailState =>
43-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
44-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
43+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4544
Behaviors.same
4645
}
4746

@@ -59,8 +58,7 @@ class SudokuProgressTracker private (
5958
case detail: SudokuDetailState =>
6059
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
6160
case msg: NewUpdatesInFlight =>
62-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
63-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
61+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6462
Behaviors.same
6563
}
6664
}

‎exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
9090
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
9191
processRequest(Some(sender), System.currentTimeMillis())
9292
case unexpectedMsg =>
93-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
94-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
93+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9594
Behaviors.same
9695

9796
}

‎exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class SudokuProgressTracker private (
4040
case NewUpdatesInFlight(updateCount) =>
4141
trackProgress(updatesInFlight + updateCount)
4242
case msg: SudokuDetailState =>
43-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
44-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
43+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4544
Behaviors.same
4645
}
4746

@@ -59,8 +58,7 @@ class SudokuProgressTracker private (
5958
case detail: SudokuDetailState =>
6059
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
6160
case msg: NewUpdatesInFlight =>
62-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
63-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
61+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6462
Behaviors.same
6563
}
6664
}

‎exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
9090
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
9191
processRequest(Some(sender), System.currentTimeMillis())
9292
case unexpectedMsg =>
93-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
94-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
93+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9594
Behaviors.same
9695

9796
}

‎exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class SudokuProgressTracker private (
4040
case NewUpdatesInFlight(updateCount) =>
4141
trackProgress(updatesInFlight + updateCount)
4242
case msg: SudokuDetailState =>
43-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
44-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
43+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4544
Behaviors.same
4645
}
4746

@@ -59,8 +58,7 @@ class SudokuProgressTracker private (
5958
case detail: SudokuDetailState =>
6059
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
6160
case msg: NewUpdatesInFlight =>
62-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
63-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
61+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6462
Behaviors.same
6563
}
6664
}

‎exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
9090
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
9191
processRequest(Some(sender), System.currentTimeMillis())
9292
case unexpectedMsg =>
93-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
94-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
93+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9594
Behaviors.same
9695

9796
}

‎exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ class SudokuProgressTracker private (
3939
case NewUpdatesInFlight(updateCount) =>
4040
trackProgress(updatesInFlight + updateCount)
4141
case msg: SudokuDetailState =>
42-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
43-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
42+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4443
Behaviors.same
4544
}
4645

@@ -58,7 +57,6 @@ class SudokuProgressTracker private (
5857
case detail: SudokuDetailState =>
5958
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
6059
case msg: NewUpdatesInFlight =>
61-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
62-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
60+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6361
Behaviors.same
6462
}

‎exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
8888
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8989
processRequest(Some(sender), System.currentTimeMillis())
9090
case unexpectedMsg =>
91-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
92-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
91+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9392
Behaviors.same
9493

9594
}

‎exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class SudokuProgressTracker private (
3838
case NewUpdatesInFlight(updateCount) =>
3939
trackProgress(updatesInFlight + updateCount)
4040
case msg: SudokuDetailState =>
41-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
42-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
41+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4342
Behaviors.same
4443
}
4544

@@ -57,7 +56,6 @@ class SudokuProgressTracker private (
5756
case detail: SudokuDetailState =>
5857
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
5958
case msg: NewUpdatesInFlight =>
60-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
61-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
59+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6260
Behaviors.same
6361
}

‎exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
8888
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8989
processRequest(Some(sender), System.currentTimeMillis())
9090
case unexpectedMsg =>
91-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
92-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
91+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9392
Behaviors.same
9493

9594
}

‎exercises/exercise_005_extension_methods/README.md

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,19 @@ Now you can use it as follows
2323
With dotty `extension methods`, we can rewrite the above as
2424

2525
```scala
26-
def (i: Int).square: Int = i * i
26+
extension (i: Int)
27+
def square: Int = i * i
2728

2829
4.square
2930
// val res0: Int = 16
3031
```
3132

32-
More than one extension methods can be wrapped inside an `Extension Instance`,
33-
in order to make them available as methods without needing to be imported explicitly.
33+
Multiple extension methods on the same type can be defined just as easily. For example:
3434

3535
```scala
36-
extension {
37-
def (x: Int).square : Int = x * x
38-
def (x: Int).isEven: Boolean = x % 2 == 0
39-
}
40-
```
41-
42-
When a series of extension methods need to be defined on the same type,
43-
encoding them one by one quickly becomes tedious. So-called
44-
`Collective Extensions` can group the definitions together.
45-
46-
```scala
47-
extension on (x: Int){
48-
def square : Int = x * x
49-
def isEven: Boolean = x % 2 == 0
50-
}
36+
extension (i: Int):
37+
def square: Int = i * i
38+
def isEven: Boolean = i % 2 == 0
5139
```
5240

5341
> At present, Collective extensions have a limitation: the individual extension

‎exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class SudokuProgressTracker private (
3838
case NewUpdatesInFlight(updateCount) =>
3939
trackProgress(updatesInFlight + updateCount)
4040
case msg: SudokuDetailState =>
41-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
42-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
41+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4342
Behaviors.same
4443
}
4544

@@ -57,7 +56,6 @@ class SudokuProgressTracker private (
5756
case detail: SudokuDetailState =>
5857
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
5958
case msg: NewUpdatesInFlight =>
60-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
61-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
59+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6260
Behaviors.same
6361
}

‎exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
8888
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8989
processRequest(Some(sender), System.currentTimeMillis())
9090
case unexpectedMsg =>
91-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
92-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
91+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9392
Behaviors.same
9493

9594
}

‎exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class SudokuProgressTracker private (
3838
case NewUpdatesInFlight(updateCount) =>
3939
trackProgress(updatesInFlight + updateCount)
4040
case msg: SudokuDetailState =>
41-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
42-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
41+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4342
Behaviors.same
4443
}
4544

@@ -57,7 +56,6 @@ class SudokuProgressTracker private (
5756
case detail: SudokuDetailState =>
5857
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
5958
case msg: NewUpdatesInFlight =>
60-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
61-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
59+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6260
Behaviors.same
6361
}

‎exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
8888
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8989
processRequest(Some(sender), System.currentTimeMillis())
9090
case unexpectedMsg =>
91-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
92-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
91+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9392
Behaviors.same
9493

9594
}

‎exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class SudokuProgressTracker private (
3838
case NewUpdatesInFlight(updateCount) =>
3939
trackProgress(updatesInFlight + updateCount)
4040
case msg: SudokuDetailState =>
41-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
42-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
41+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4342
Behaviors.same
4443
}
4544

@@ -57,7 +56,6 @@ class SudokuProgressTracker private (
5756
case detail: SudokuDetailState =>
5857
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
5958
case msg: NewUpdatesInFlight =>
60-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
61-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
59+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6260
Behaviors.same
6361
}

‎exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
8888
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8989
processRequest(Some(sender), System.currentTimeMillis())
9090
case unexpectedMsg =>
91-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
92-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
91+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9392
Behaviors.same
9493

9594
}

‎exercises/exercise_008_enum_and_export/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@ In Dotty, we can use enumerations to encode the protocol in a more succinct way.
2626
The example protocol listed above can be encoded in the following fashion:
2727

2828
```scala
29-
enum Command {
29+
enum Command:
3030
case CommandA(n: Int)
3131
case CommandB
3232
case CommandC(n1: Double)
33-
}
3433

35-
enum Response {
34+
enum Response:
3635
case ResponseA(sum: Double)
3736
case ResponseB
38-
}
3937
```
4038

4139
The compiler will desugar this encoding in `case class`es and `case object`s that

‎exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class SudokuProgressTracker private (
4141
case NewUpdatesInFlight(updateCount) =>
4242
trackProgress(updatesInFlight + updateCount)
4343
case msg: SudokuDetailState =>
44-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
45-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
44+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4645
Behaviors.same
4746
}
4847

@@ -60,7 +59,6 @@ class SudokuProgressTracker private (
6059
case detail: SudokuDetailState =>
6160
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
6261
case msg: NewUpdatesInFlight =>
63-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
64-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
62+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6563
Behaviors.same
6664
}

‎exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
8686
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8787
processRequest(Some(sender), System.currentTimeMillis())
8888
case unexpectedMsg =>
89-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
90-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
89+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
9190
Behaviors.same
9291

9392
}

‎exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class SudokuProgressTracker private (
4141
case NewUpdatesInFlight(updateCount) =>
4242
trackProgress(updatesInFlight + updateCount)
4343
case msg: SudokuDetailState =>
44-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
45-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
44+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4645
Behaviors.same
4746
}
4847

@@ -60,7 +59,6 @@ class SudokuProgressTracker private (
6059
case detail: SudokuDetailState =>
6160
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
6261
case msg: NewUpdatesInFlight =>
63-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
64-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
62+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6563
Behaviors.same
6664
}

‎exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons
8080
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8181
processRequest(Some(sender), System.currentTimeMillis())
8282
case unexpectedMsg =>
83-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
84-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
83+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
8584
Behaviors.same
8685

8786
}

‎exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class SudokuProgressTracker private (
4141
case NewUpdatesInFlight(updateCount) =>
4242
trackProgress(updatesInFlight + updateCount)
4343
case msg: SudokuDetailState =>
44-
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
45-
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
44+
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
4645
Behaviors.same
4746
}
4847

@@ -60,7 +59,6 @@ class SudokuProgressTracker private (
6059
case detail: SudokuDetailState =>
6160
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
6261
case msg: NewUpdatesInFlight =>
63-
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
64-
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
62+
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
6563
Behaviors.same
6664
}

‎exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons
8080
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
8181
processRequest(Some(sender), System.currentTimeMillis())
8282
case unexpectedMsg =>
83-
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
84-
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
83+
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
8584
Behaviors.same
8685

8786
}

‎exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ extension[A] (updates: CellUpdates)
3030

3131
def size: Int = updates.size
3232

33-
def (update: (Int, Set[Int])) +: (updates: CellUpdates): CellUpdates = update +: updates
33+
extension (update: (Int, Set[Int]))
34+
def +: (updates: CellUpdates): CellUpdates = update +: updates
3435

3536
import SudokuDetailProcessor.RowUpdate
3637

0 commit comments

Comments
 (0)