cvd: SummaryHelp returns string w/o Result wrapper

jemoreira · Databean · commit 1c559c9e36a6 · 2026-05-12T20:45:25.000Z
No implementation of that function should ever fail as command
implementations should just return a constant string summarizing what
the command does.
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp
@@ -92,7 +92,7 @@ class CvdBugreportCommandHandler : public CvdCommandHandler {
 
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override;
-  Result<std::string> SummaryHelp() const override;
+  std::string SummaryHelp() const override;
 
   bool RequiresDeviceExists() const override;
   Result<std::string> DetailedHelp(const CommandRequest& request) const override;
@@ -157,7 +157,7 @@ std::vector<std::string> CvdBugreportCommandHandler::CmdList() const {
   return {"bugreport", "host_bugreport", "cvd_host_bugreport"};
 }
 
-Result<std::string> CvdBugreportCommandHandler::SummaryHelp() const {
+std::string CvdBugreportCommandHandler::SummaryHelp() const {
   return kSummaryHelpText;
 }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/cache.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/cache.cpp
@@ -99,7 +99,7 @@ class CvdCacheCommandHandler : public CvdCommandHandler {
  public:
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override { return {"cache"}; }
-  Result<std::string> SummaryHelp() const override;
+  std::string SummaryHelp() const override;
 
   Result<std::string> DetailedHelp(const CommandRequest& request) const override;
 };
@@ -149,7 +149,7 @@ Result<void> CvdCacheCommandHandler::Handle(const CommandRequest& request) {
   return {};
 }
 
-Result<std::string> CvdCacheCommandHandler::SummaryHelp() const {
+std::string CvdCacheCommandHandler::SummaryHelp() const {
   return kSummaryHelpText;
 }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp
@@ -40,7 +40,7 @@ class CvdClearCommandHandler : public CvdCommandHandler {
 
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override { return {kClearCmd}; }
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
   bool RequiresDeviceExists() const override { return true; }
   Result<std::string> DetailedHelp(const CommandRequest& request) const override;
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/command_handler.h b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/command_handler.h
@@ -33,7 +33,7 @@ class CvdCommandHandler {
   // returns the list of subcommand it can handle
   virtual cvd_common::Args CmdList() const = 0;
   // used for command help text
-  virtual Result<std::string> SummaryHelp() const = 0;
+  virtual std::string SummaryHelp() const = 0;
   virtual bool RequiresDeviceExists() const;
   virtual Result<std::string> DetailedHelp(const CommandRequest&) const = 0;
 };
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.cpp
@@ -209,7 +209,7 @@ class CvdCreateCommandHandler : public CvdCommandHandler {
 
   Result<void> Handle(const CommandRequest& request) override;
   std::vector<std::string> CmdList() const override { return {"create"}; }
-  Result<std::string> SummaryHelp() const override;
+  std::string SummaryHelp() const override;
 
   Result<std::string> DetailedHelp(const CommandRequest& request) const override;
 
@@ -345,7 +345,7 @@ Result<void> CvdCreateCommandHandler::Handle(const CommandRequest& request) {
   return {};
 }
 
-Result<std::string> CvdCreateCommandHandler::SummaryHelp() const {
+std::string CvdCreateCommandHandler::SummaryHelp() const {
   return kSummaryHelpText;
 }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/display.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/display.cpp
@@ -87,7 +87,7 @@ class CvdDisplayCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {"display"}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/env.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/env.cpp
@@ -76,7 +76,7 @@ class CvdEnvCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {"env"}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/fetch.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/fetch.cpp
@@ -47,7 +47,7 @@ class CvdFetchCommandHandler : public CvdCommandHandler {
  public:
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override { return {"fetch", "fetch_cvd"}; }
-  Result<std::string> SummaryHelp() const override;
+  std::string SummaryHelp() const override;
 
   Result<std::string> DetailedHelp(const CommandRequest& request) const override;
 };
@@ -119,7 +119,7 @@ Result<void> CvdFetchCommandHandler::Handle(const CommandRequest& request) {
   return {};
 }
 
-Result<std::string> CvdFetchCommandHandler::SummaryHelp() const {
+std::string CvdFetchCommandHandler::SummaryHelp() const {
   return "Retrieve build artifacts based on branch and target names";
 }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/fleet.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/fleet.cpp
@@ -49,7 +49,7 @@ class CvdFleetCommandHandler : public CvdCommandHandler {
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override { return {kFleetSubcmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/help.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/help.cpp
@@ -83,7 +83,7 @@ class CvdHelpHandler : public CvdCommandHandler {
 
     std::vector<std::string> args = request.SubcommandArguments();
     if (args.empty()) {
-      std::cout << CF_EXPECT(TopLevelHelp());
+      std::cout << TopLevelHelp();
     } else {
       std::cout << CF_EXPECT(SubCommandHelp(request));
     }
@@ -93,7 +93,7 @@ class CvdHelpHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {"help"}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
@@ -107,13 +107,13 @@ class CvdHelpHandler : public CvdCommandHandler {
     return CF_EXPECT(std::move(builder).Build());
   }
 
-  Result<std::string> TopLevelHelp() {
+  std::string TopLevelHelp() {
     std::stringstream help_message;
     help_message << kHelpIntroText;
 
     for (const auto& handler : request_handlers_) {
       if (!handler->RequiresDeviceExists()) {
-        CF_EXPECT(PrintHandler(help_message, *handler));
+        PrintHandler(help_message, *handler);
       }
     }
 
@@ -122,18 +122,17 @@ class CvdHelpHandler : public CvdCommandHandler {
                     "information):\n";
     for (const auto& handler : request_handlers_) {
       if (handler->RequiresDeviceExists()) {
-        CF_EXPECT(PrintHandler(help_message, *handler));
+        PrintHandler(help_message, *handler);
       }
     }
 
     return help_message.str();
   }
 
-  Result<void> PrintHandler(std::stringstream& help_message,
+  void PrintHandler(std::stringstream& help_message,
                             const CvdCommandHandler& handler) const {
     help_message << "\t" << absl::StrJoin(handler.CmdList(), ", ") << " - ";
-    help_message << CF_EXPECT(handler.SummaryHelp()) << "\n\n";
-    return {};
+    help_message << handler.SummaryHelp() << "\n\n";
   }
 
   Result<std::string> SubCommandHelp(const CommandRequest& request) {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/lint.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/lint.cpp
@@ -60,7 +60,7 @@ class LintCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {kLintSubCmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/load_configs.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/load_configs.cpp
@@ -194,7 +194,7 @@ class LoadConfigsCommand : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {kLoadSubCmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/login.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/login.cpp
@@ -90,7 +90,7 @@ class CvdLoginCommand : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {"login"}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/logs.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/logs.cpp
@@ -105,7 +105,7 @@ class CvdLogsHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {"logs"}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
   bool RequiresDeviceExists() const override { return true; }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/monitor.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/monitor.cpp
@@ -239,7 +239,7 @@ class CvdMonitorCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {kMonitorCmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
   bool RequiresDeviceExists() const override { return true; }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/power_btn.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/power_btn.cpp
@@ -53,7 +53,7 @@ class CvdDevicePowerBtnCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {kPowerBtnCmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/powerwash.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/powerwash.cpp
@@ -83,7 +83,7 @@ class CvdDevicePowerwashCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {kPowerwashCmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp
@@ -43,7 +43,7 @@ class RemoveCvdCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {"remove", "rm"}; }
 
-  Result<std::string> SummaryHelp() const override {
+  std::string SummaryHelp() const override {
     return "Remove devices and artifacts from the system.";
   }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/reset.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/reset.cpp
@@ -133,7 +133,7 @@ class CvdResetCommandHandler : public CvdCommandHandler {
   }
   cvd_common::Args CmdList() const override { return {kResetSubcmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/restart.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/restart.cpp
@@ -83,7 +83,7 @@ class CvdDeviceRestartCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {kRestartCmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/screen_recording.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/screen_recording.cpp
@@ -162,7 +162,7 @@ class ScreenRecordingCommandHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {kScreenRecordingCmd}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/snapshot.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/snapshot.cpp
@@ -101,7 +101,7 @@ class CvdSnapshotCommandHandler : public CvdCommandHandler {
     return {"suspend", "resume", "snapshot_take"};
   }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp
@@ -251,7 +251,7 @@ class CvdStartCommandHandler : public CvdCommandHandler {
   std::vector<std::string> CmdList() const override {
     return {"start", "launch_cvd"};
   }
-  Result<std::string> SummaryHelp() const override {
+  std::string SummaryHelp() const override {
     return "Start a Cuttlefish virtual device or environment";
   }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/status.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/status.cpp
@@ -121,7 +121,7 @@ class CvdStatusCommandHandler : public CvdCommandHandler {
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override { return {"status", "cvd_status"}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/stop.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/stop.cpp
@@ -82,7 +82,7 @@ class CvdStopCommandHandler : public CvdCommandHandler {
 
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override { return {"stop", "stop_cvd"}; }
-  Result<std::string> SummaryHelp() const override;
+  std::string SummaryHelp() const override;
 
   bool RequiresDeviceExists() const override { return true; }
   Result<std::string> DetailedHelp(const CommandRequest& request) const override;
@@ -136,7 +136,7 @@ Result<void> CvdStopCommandHandler::Handle(const CommandRequest& request) {
   return {};
 }
 
-Result<std::string> CvdStopCommandHandler::SummaryHelp() const {
+std::string CvdStopCommandHandler::SummaryHelp() const {
   return kSummaryHelpText;
 }
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/version.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/version.cpp
@@ -75,7 +75,7 @@ class CvdVersionHandler : public CvdCommandHandler {
 
   cvd_common::Args CmdList() const override { return {"version"}; }
 
-  Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
+  std::string SummaryHelp() const override { return kSummaryHelpText; }
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class CvdBugreportCommandHandler : public CvdCommandHandler {`
`92`	`92`
`93`	`93`	`Result<void> Handle(const CommandRequest& request) override;`
`94`	`94`	`cvd_common::Args CmdList() const override;`
`95`		`- Result<std::string> SummaryHelp() const override;`
	`95`	`+ std::string SummaryHelp() const override;`
`96`	`96`
`97`	`97`	`bool RequiresDeviceExists() const override;`
`98`	`98`	`Result<std::string> DetailedHelp(const CommandRequest& request) const override;`
`@@ -157,7 +157,7 @@ std::vector<std::string> CvdBugreportCommandHandler::CmdList() const {`
`157`	`157`	`return {"bugreport", "host_bugreport", "cvd_host_bugreport"};`
`158`	`158`	`}`
`159`	`159`
`160`		`-Result<std::string> CvdBugreportCommandHandler::SummaryHelp() const {`
	`160`	`+std::string CvdBugreportCommandHandler::SummaryHelp() const {`
`161`	`161`	`return kSummaryHelpText;`
`162`	`162`	`}`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class CvdCacheCommandHandler : public CvdCommandHandler {`
`99`	`99`	`public:`
`100`	`100`	`Result<void> Handle(const CommandRequest& request) override;`
`101`	`101`	`cvd_common::Args CmdList() const override { return {"cache"}; }`
`102`		`- Result<std::string> SummaryHelp() const override;`
	`102`	`+ std::string SummaryHelp() const override;`
`103`	`103`
`104`	`104`	`Result<std::string> DetailedHelp(const CommandRequest& request) const override;`
`105`	`105`	`};`
`@@ -149,7 +149,7 @@ Result<void> CvdCacheCommandHandler::Handle(const CommandRequest& request) {`
`149`	`149`	`return {};`
`150`	`150`	`}`
`151`	`151`
`152`		`-Result<std::string> CvdCacheCommandHandler::SummaryHelp() const {`
	`152`	`+std::string CvdCacheCommandHandler::SummaryHelp() const {`
`153`	`153`	`return kSummaryHelpText;`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ class CvdCreateCommandHandler : public CvdCommandHandler {`
`209`	`209`
`210`	`210`	`Result<void> Handle(const CommandRequest& request) override;`
`211`	`211`	`std::vector<std::string> CmdList() const override { return {"create"}; }`
`212`		`- Result<std::string> SummaryHelp() const override;`
	`212`	`+ std::string SummaryHelp() const override;`
`213`	`213`
`214`	`214`	`Result<std::string> DetailedHelp(const CommandRequest& request) const override;`
`215`	`215`
`@@ -345,7 +345,7 @@ Result<void> CvdCreateCommandHandler::Handle(const CommandRequest& request) {`
`345`	`345`	`return {};`
`346`	`346`	`}`
`347`	`347`
`348`		`-Result<std::string> CvdCreateCommandHandler::SummaryHelp() const {`
	`348`	`+std::string CvdCreateCommandHandler::SummaryHelp() const {`
`349`	`349`	`return kSummaryHelpText;`
`350`	`350`	`}`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class CvdDisplayCommandHandler : public CvdCommandHandler {`
`87`	`87`
`88`	`88`	`cvd_common::Args CmdList() const override { return {"display"}; }`
`89`	`89`
`90`		`- Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }`
	`90`	`+ std::string SummaryHelp() const override { return kSummaryHelpText; }`
`91`	`91`
`92`	`92`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class CvdEnvCommandHandler : public CvdCommandHandler {`
`76`	`76`
`77`	`77`	`cvd_common::Args CmdList() const override { return {"env"}; }`
`78`	`78`
`79`		`- Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }`
	`79`	`+ std::string SummaryHelp() const override { return kSummaryHelpText; }`
`80`	`80`
`81`	`81`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class CvdFetchCommandHandler : public CvdCommandHandler {`
`47`	`47`	`public:`
`48`	`48`	`Result<void> Handle(const CommandRequest& request) override;`
`49`	`49`	`cvd_common::Args CmdList() const override { return {"fetch", "fetch_cvd"}; }`
`50`		`- Result<std::string> SummaryHelp() const override;`
	`50`	`+ std::string SummaryHelp() const override;`
`51`	`51`
`52`	`52`	`Result<std::string> DetailedHelp(const CommandRequest& request) const override;`
`53`	`53`	`};`
`@@ -119,7 +119,7 @@ Result<void> CvdFetchCommandHandler::Handle(const CommandRequest& request) {`
`119`	`119`	`return {};`
`120`	`120`	`}`
`121`	`121`
`122`		`-Result<std::string> CvdFetchCommandHandler::SummaryHelp() const {`
	`122`	`+std::string CvdFetchCommandHandler::SummaryHelp() const {`
`123`	`123`	`return "Retrieve build artifacts based on branch and target names";`
`124`	`124`	`}`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class CvdHelpHandler : public CvdCommandHandler {`
`83`	`83`
`84`	`84`	`std::vector<std::string> args = request.SubcommandArguments();`
`85`	`85`	`if (args.empty()) {`
`86`		`- std::cout << CF_EXPECT(TopLevelHelp());`
	`86`	`+ std::cout << TopLevelHelp();`
`87`	`87`	`} else {`
`88`	`88`	`std::cout << CF_EXPECT(SubCommandHelp(request));`
`89`	`89`	`}`
`@@ -93,7 +93,7 @@ class CvdHelpHandler : public CvdCommandHandler {`
`93`	`93`
`94`	`94`	`cvd_common::Args CmdList() const override { return {"help"}; }`
`95`	`95`
`96`		`- Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }`
	`96`	`+ std::string SummaryHelp() const override { return kSummaryHelpText; }`
`97`	`97`
`98`	`98`
`99`	`99`
`@@ -107,13 +107,13 @@ class CvdHelpHandler : public CvdCommandHandler {`
`107`	`107`	`return CF_EXPECT(std::move(builder).Build());`
`108`	`108`	`}`
`109`	`109`
`110`		`- Result<std::string> TopLevelHelp() {`
	`110`	`+ std::string TopLevelHelp() {`
`111`	`111`	`std::stringstream help_message;`
`112`	`112`	`help_message << kHelpIntroText;`
`113`	`113`
`114`	`114`	`for (const auto& handler : request_handlers_) {`
`115`	`115`	`if (!handler->RequiresDeviceExists()) {`
`116`		`- CF_EXPECT(PrintHandler(help_message, *handler));`
	`116`	`+ PrintHandler(help_message, *handler);`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`@@ -122,18 +122,17 @@ class CvdHelpHandler : public CvdCommandHandler {`
`122`	`122`	`"information):\n";`
`123`	`123`	`for (const auto& handler : request_handlers_) {`
`124`	`124`	`if (handler->RequiresDeviceExists()) {`
`125`		`- CF_EXPECT(PrintHandler(help_message, *handler));`
	`125`	`+ PrintHandler(help_message, *handler);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`return help_message.str();`
`130`	`130`	`}`
`131`	`131`
`132`		`- Result<void> PrintHandler(std::stringstream& help_message,`
	`132`	`+ void PrintHandler(std::stringstream& help_message,`
`133`	`133`	`const CvdCommandHandler& handler) const {`
`134`	`134`	`help_message << "\t" << absl::StrJoin(handler.CmdList(), ", ") << " - ";`
`135`		`- help_message << CF_EXPECT(handler.SummaryHelp()) << "\n\n";`
`136`		`- return {};`
	`135`	`+ help_message << handler.SummaryHelp() << "\n\n";`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`Result<std::string> SubCommandHelp(const CommandRequest& request) {`