Make use of SetTextProtoFile() when writing textproto.

Less code, and automatically get the added benefit that the type is written to the proto file for easier human- and tool readability. PiperOrigin-RevId: 683377205
google · Oct 7, 2024 · 74a99d8 · 74a99d8
1 parent f9f929b
commit 74a99d8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/xls/fuzzer/run_fuzz.cc b/xls/fuzzer/run_fuzz.cc
@@ -202,7 +202,7 @@ absl::Status RunSample(const Sample& smp, const std::filesystem::path& run_dir,
 
   std::filesystem::path options_file_name = run_dir / "options.pbtxt";
   XLS_RETURN_IF_ERROR(
-      SetFileContents(options_file_name, smp.options().ToPbtxt()));
+      SetTextProtoFile(options_file_name, smp.options().proto()));
   argv.push_back("--options_file=options.pbtxt");
 
   std::filesystem::path args_file_name = run_dir / "args.txt";

diff --git a/xls/fuzzer/sample.cc b/xls/fuzzer/sample.cc
@@ -112,12 +112,6 @@ std::vector<std::string> ParseIrChannelNames(
   return FromProto(proto);
 }
 
-std::string SampleOptions::ToPbtxt() const {
-  std::string pbtxt;
-  CHECK(google::protobuf::TextFormat::PrintToString(proto_, &pbtxt));
-  return pbtxt;
-}
-
 /* static */ absl::StatusOr<SampleOptions> SampleOptions::FromProto(
     fuzzer::SampleOptionsProto proto) {
   SampleOptions options;

diff --git a/xls/fuzzer/sample.h b/xls/fuzzer/sample.h
@@ -60,8 +60,6 @@ class SampleOptions {
 
   // Convert to/from text serialized SampleOptionsProto.
   static absl::StatusOr<SampleOptions> FromPbtxt(std::string_view text);
-  std::string ToPbtxt() const;
-
   static absl::StatusOr<SampleOptions> FromProto(
       fuzzer::SampleOptionsProto proto);
 

diff --git a/xls/fuzzer/sample_runner.cc b/xls/fuzzer/sample_runner.cc
@@ -828,8 +828,7 @@ absl::Status SampleRunner::Run(const Sample& sample) {
   XLS_RETURN_IF_ERROR(SetFileContents(input_path, sample.input_text()));
 
   std::filesystem::path options_path = run_dir_ / "options.pbtxt";
-  XLS_RETURN_IF_ERROR(
-      SetFileContents(options_path, sample.options().ToPbtxt()));
+  XLS_RETURN_IF_ERROR(SetTextProtoFile(options_path, sample.options().proto()));
 
   std::filesystem::path args_path = run_dir_ / "args.txt";
   XLS_RETURN_IF_ERROR(