Skip to content

Commit

Permalink
Bump Dotty version to Scala 3.0.0-M1/Remove workaround/Correct extens…
Browse files Browse the repository at this point in the history
…ions 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
  • Loading branch information
eloots committed Nov 9, 2020
1 parent a5b6804 commit 5fd315a
Show file tree
Hide file tree
Showing 30 changed files with 47 additions and 80 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -9,10 +9,11 @@ collectedLogs.zip
.vscode
*.code-workspace

# Metals/Bloop specific
# Metals/Bloop/sbt BSP specific
.bloop/
.metals/
.swp
.bsp
**/project/metals.sbt

# sbt specific
Expand Down
Expand Up @@ -40,8 +40,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -59,8 +58,7 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
}
Expand Up @@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -40,8 +40,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -59,8 +58,7 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
}
Expand Up @@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -40,8 +40,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -59,8 +58,7 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
}
Expand Up @@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -39,8 +39,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -58,7 +57,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -38,8 +38,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -57,7 +56,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -38,8 +38,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -57,7 +56,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -38,8 +38,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -57,7 +56,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -38,8 +38,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -57,7 +56,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -41,8 +41,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -60,7 +59,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -86,8 +86,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command],
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -41,8 +41,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -60,7 +59,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -41,8 +41,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -60,7 +59,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down
Expand Up @@ -30,7 +30,8 @@ extension[A] (updates: CellUpdates)

def size: Int = updates.size

def (update: (Int, Set[Int])) +: (updates: CellUpdates): CellUpdates = update +: updates
extension (update: (Int, Set[Int]))
def +: (updates: CellUpdates): CellUpdates = update +: updates

import SudokuDetailProcessor.RowUpdate

Expand Down
Expand Up @@ -41,8 +41,7 @@ class SudokuProgressTracker private (
case NewUpdatesInFlight(updateCount) =>
trackProgress(updatesInFlight + updateCount)
case msg: SudokuDetailState =>
// context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}")
context.log.error("Received unexpected message in state 'trackProgress': {}", msg)
Behaviors.same
}

Expand All @@ -60,7 +59,6 @@ class SudokuProgressTracker private (
case detail: SudokuDetailState =>
collectEndState(remainingRows = remainingRows - 1, detail +: endState)
case msg: NewUpdatesInFlight =>
// context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}")
context.log.error("Received unexpected message in state 'collectEndState': {}", msg)
Behaviors.same
}
Expand Up @@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons
progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size)
processRequest(Some(sender), System.currentTimeMillis())
case unexpectedMsg =>
// context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}")
context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg)
Behaviors.same

}
Expand Down

0 comments on commit 5fd315a

Please sign in to comment.