From 346baec783a7423aa5b6cacaf7eebb8d22d4ce79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 7 Dec 2020 13:04:24 +0100
Subject: [PATCH] Move doc() to Args

---
 src/libutil/args.cc | 4 ++--
 src/libutil/args.hh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index 61f9503ec..a929ea5ac 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -254,6 +254,8 @@ nlohmann::json Args::toJSON()
     res["description"] = description();
     res["flags"] = std::move(flags);
     res["args"] = std::move(args);
+    auto s = doc();
+    if (s != "") res.emplace("doc", stripIndentation(s));
     return res;
 }
 
@@ -378,8 +380,6 @@ nlohmann::json Command::toJSON()
 
     auto res = Args::toJSON();
     res["examples"] = std::move(exs);
-    auto s = doc();
-    if (s != "") res.emplace("doc", stripIndentation(s));
     return res;
 }
 
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index 8069fd70f..68bbbb4f7 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -25,6 +25,9 @@ public:
     /* Return a short one-line description of the command. */
     virtual std::string description() { return ""; }
 
+    /* Return documentation about this command, in Markdown format. */
+    virtual std::string doc() { return ""; }
+
 protected:
 
     static const size_t ArityAny = std::numeric_limits<size_t>::max();
@@ -225,9 +228,6 @@ struct Command : virtual Args
     virtual void prepare() { };
     virtual void run() = 0;
 
-    /* Return documentation about this command, in Markdown format. */
-    virtual std::string doc() { return ""; }
-
     struct Example
     {
         std::string description;