Thread/Scheduler: Minor fixes

Author: MorganCaron

.clang-format

@@ -95,6 +95,7 @@ BinPackParameters: false
 BinPackArguments: false
 BreakAfterAttributes: Never
 BreakBeforeTernaryOperators: false
+BreakBeforeBinaryOperators: NonAssignment
 BreakInheritanceList: AfterColon
 BreakConstructorInitializers: AfterColon
 

modules/Thread/Scheduler.mpp

@@ -143,12 +143,11 @@ export namespace CppUtils::Thread
 				return;
 
 			const auto endTime = first->time + m_step;
-			for (auto it = std::begin(set); it != std::end(set) and (*it)->time <= endTime; ++it)
+			for (auto it = std::begin(set); it != std::end(set) and (*it)->time <= endTime;)
 			{
 				auto item = *it;
-				++it;
+				it = set.erase(it);
 				map.erase(item->id);
-				set.erase(item);
 				if (not item->cancelled)
 				{
 					accessor.getLockGuard().unlock();

tests/Terminal/Canvas.mpp

@@ -5,7 +5,7 @@ import CppUtils;
 
 export namespace CppUtils::UnitTest::Terminal::Canvas
 {
-	inline auto _ = TestSuite{"Terminal/Canvas", {"UnitTest", "Execution/Planner"}, [](auto& suite) {
+	inline auto _ = TestSuite{"Terminal/Canvas", {"UnitTest", "Thread/Scheduler"}, [](auto& suite) {
 		using namespace std::literals;
 		using namespace std::chrono_literals;
 
@@ -42,9 +42,9 @@ export namespace CppUtils::UnitTest::Terminal::Canvas
 				}
 		});
 
-		suite.addTest("Fill with planner", [&] {
+		suite.addTest("Fill with scheduler", [&] {
 			auto canvas = CppUtils::Terminal::v2::Canvas{CppUtils::Container::Size2{10, 5}};
-			auto planner = CppUtils::Thread::Planner{};
+			auto scheduler = CppUtils::Thread::Scheduler{};
 			const auto chars = "-\\|/"sv;
 			auto loop = 0uz, frame = 0uz;
 			auto updateFrame = [&](this const auto& self) -> void {
@@ -59,7 +59,7 @@ export namespace CppUtils::UnitTest::Terminal::Canvas
 						return;
 					}
 				}
-				planner.schedule(self, 50ms);
+				scheduler.schedule(self, 50ms);
 			};
 			updateFrame();
 			canvas.wait();