Replaced assert_throw with assert_fatal

coder137 · coder137 · commit 7cdadd10e483 · 2022-04-21T21:16:51.000-07:00
diff --git a/buildcc/lib/target/src/generator/task.cpp b/buildcc/lib/target/src/generator/task.cpp
@@ -52,7 +52,7 @@ void Generator::GenerateTask() {
     auto run_command = [this](const std::string &command) {
       try {
         bool success = env::Command::Execute(command);
-        env::assert_throw(success, fmt::format("{} failed", command));
+        env::assert_fatal(success, fmt::format("{} failed", command));
       } catch (...) {
         std::lock_guard<std::mutex> guard(task_state_mutex_);
         task_state_ = env::TaskState::FAILURE;
@@ -104,7 +104,7 @@ void Generator::GenerateTask() {
       if (dirty_) {
         try {
           serialization_.UpdateStore(user_);
-          env::assert_throw(serialization_.StoreToFile(),
+          env::assert_fatal(serialization_.StoreToFile(),
                             fmt::format("Store failed for {}", name_));
         } catch (...) {
           task_state_ = env::TaskState::FAILURE;
diff --git a/buildcc/lib/target/src/target/friend/compile_pch.cpp b/buildcc/lib/target/src/target/friend/compile_pch.cpp
@@ -54,7 +54,7 @@ void AggregateToFile(const fs::path &filename,
                });
   bool success = buildcc::env::save_file(
       buildcc::path_as_string(filename).c_str(), constructed_output, false);
-  buildcc::env::assert_throw(success, "Could not save pch file");
+  buildcc::env::assert_fatal(success, "Could not save pch file");
 }
 
 } // namespace
@@ -108,10 +108,10 @@ void CompilePch::BuildCompile() {
       const std::string p = fmt::format("{}", source_path_);
       const bool save =
           env::save_file(p.c_str(), {"//Generated by BuildCC"}, false);
-      env::assert_throw(save, fmt::format("Could not save {}", p));
+      env::assert_fatal(save, fmt::format("Could not save {}", p));
     }
     bool success = env::Command::Execute(command_);
-    env::assert_throw(success, "Failed to compile pch");
+    env::assert_fatal(success, "Failed to compile pch");
   }
 }
 
diff --git a/buildcc/lib/target/src/target/friend/link_target.cpp b/buildcc/lib/target/src/target/friend/link_target.cpp
@@ -98,7 +98,7 @@ void LinkTarget::BuildLink() {
 
   if (target_.dirty_) {
     bool success = env::Command::Execute(command_);
-    env::assert_throw(success, "Failed to link target");
+    env::assert_fatal(success, "Failed to link target");
     target_.serialization_.UpdateTargetCompiled();
   }
 }
diff --git a/buildcc/lib/target/src/target/tasks.cpp b/buildcc/lib/target/src/target/tasks.cpp
@@ -124,7 +124,7 @@ void CompileObject::Task() {
               try {
                 bool success = env::Command::Execute(
                     GetObjectData(s.GetPathname()).command);
-                env::assert_throw(success, "Could not compile source");
+                env::assert_fatal(success, "Could not compile source");
                 target_.serialization_.AddSource(s);
               } catch (...) {
                 target_.SetTaskStateFailure();
@@ -170,7 +170,7 @@ void Target::EndTask() {
     if (dirty_) {
       try {
         serialization_.UpdateStore(user_);
-        env::assert_throw(serialization_.StoreToFile(),
+        env::assert_fatal(serialization_.StoreToFile(),
                           fmt::format("Store failed for {}", GetName()));
         state_.BuildCompleted();
       } catch (...) {
diff --git a/buildcc/schema/include/schema/path.h b/buildcc/schema/include/schema/path.h
@@ -25,7 +25,7 @@
 #include <unordered_set>
 
 // Env
-#include "env/assert_throw.h"
+#include "env/assert_fatal.h"
 
 // Third party
 #include "fmt/format.h"
@@ -51,7 +51,7 @@ class Path {
         std::filesystem::last_write_time(pathname, errcode)
             .time_since_epoch()
             .count();
-    env::assert_throw(errcode.value() == 0,
+    env::assert_fatal(errcode.value() == 0,
                       fmt::format("{} not found", pathname));
 
     return Path(pathname, last_write_timestamp);

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ void AggregateToFile(const fs::path &filename,`
`54`	`54`	`});`
`55`	`55`	`bool success = buildcc::env::save_file(`
`56`	`56`	`buildcc::path_as_string(filename).c_str(), constructed_output, false);`
`57`		`- buildcc::env::assert_throw(success, "Could not save pch file");`
	`57`	`+ buildcc::env::assert_fatal(success, "Could not save pch file");`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`} // namespace`
`@@ -108,10 +108,10 @@ void CompilePch::BuildCompile() {`
`108`	`108`	`const std::string p = fmt::format("{}", source_path_);`
`109`	`109`	`const bool save =`
`110`	`110`	`env::save_file(p.c_str(), {"//Generated by BuildCC"}, false);`
`111`		`- env::assert_throw(save, fmt::format("Could not save {}", p));`
	`111`	`+ env::assert_fatal(save, fmt::format("Could not save {}", p));`
`112`	`112`	`}`
`113`	`113`	`bool success = env::Command::Execute(command_);`
`114`		`- env::assert_throw(success, "Failed to compile pch");`
	`114`	`+ env::assert_fatal(success, "Failed to compile pch");`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ void LinkTarget::BuildLink() {`
`98`	`98`
`99`	`99`	`if (target_.dirty_) {`
`100`	`100`	`bool success = env::Command::Execute(command_);`
`101`		`- env::assert_throw(success, "Failed to link target");`
	`101`	`+ env::assert_fatal(success, "Failed to link target");`
`102`	`102`	`target_.serialization_.UpdateTargetCompiled();`
`103`	`103`	`}`
`104`	`104`	`}`