[format] Adapt to latest clang-format config

include/multipass/cli/format_utils.h

@@ -47,15 +47,16 @@ void filter_aliases(google::protobuf::RepeatedPtrField<multipass::FindReply_Alia
 
 // Computes the column width needed to display all the elements of a range [begin, end). get_width is a function
 // which takes as input the element in the range and returns its width in columns.
-static constexpr auto column_width = [](const auto begin, const auto end, const auto get_width, int header_width,
-                                        int minimum_width = 0) {
-    if (0 == std::distance(begin, end))
-        return std::max({header_width + col_buffer, minimum_width});
-
-    auto max_width =
-        std::max_element(begin, end, [&get_width](auto& lhs, auto& rhs) { return get_width(lhs) < get_width(rhs); });
-    return std::max({get_width(*max_width) + col_buffer, header_width + col_buffer, minimum_width});
-};
+static constexpr auto column_width =
+    [](const auto begin, const auto end, const auto get_width, int header_width, int minimum_width = 0) {
+        if (0 == std::distance(begin, end))
+            return std::max({header_width + col_buffer, minimum_width});
+
+        auto max_width = std::max_element(begin, end, [&get_width](auto& lhs, auto& rhs) {
+            return get_width(lhs) < get_width(rhs);
+        });
+        return std::max({get_width(*max_width) + col_buffer, header_width + col_buffer, minimum_width});
+    };
 } // namespace format
 } // namespace multipass
 

include/multipass/file_ops.h

@@ -46,7 +46,8 @@ class FileOps : public Singleton<FileOps>
     // QDir operations
     virtual bool exists(const QDir& dir) const;
     virtual bool isReadable(const QDir& dir) const;
-    virtual QFileInfoList entryInfoList(const QDir& dir, const QStringList& nameFilters,
+    virtual QFileInfoList entryInfoList(const QDir& dir,
+                                        const QStringList& nameFilters,
                                         QDir::Filters filters = QDir::NoFilter,
                                         QDir::SortFlags sort = QDir::NoSort) const;
     virtual bool mkpath(const QDir& dir, const QString& dirName) const;

include/multipass/mount_handler.h

@@ -84,7 +84,9 @@ class MountHandler : private DisabledCopyMove
 
 protected:
     MountHandler() = default;
-    MountHandler(VirtualMachine* vm, const SSHKeyProvider* ssh_key_provider, VMMount mount_spec,
+    MountHandler(VirtualMachine* vm,
+                 const SSHKeyProvider* ssh_key_provider,
+                 VMMount mount_spec,
                  const std::string& target)
         : vm{vm}, ssh_key_provider{ssh_key_provider}, mount_spec{std::move(mount_spec)}, target{target}, active{false}
     {

include/multipass/sshfs_mount/sshfs_mount_handler.h

@@ -28,7 +28,9 @@ namespace multipass
 class SSHFSMountHandler : public MountHandler
 {
 public:
-    SSHFSMountHandler(VirtualMachine* vm, const SSHKeyProvider* ssh_key_provider, const std::string& target,
+    SSHFSMountHandler(VirtualMachine* vm,
+                      const SSHKeyProvider* ssh_key_provider,
+                      const std::string& target,
                       VMMount mount_spec);
     ~SSHFSMountHandler() override;
 

include/multipass/utils.h

@@ -214,7 +214,8 @@ class Utils : public Singleton<Utils>
     // virtual machine helpers
     virtual void wait_for_cloud_init(VirtualMachine* virtual_machine, std::chrono::milliseconds timeout,
                                      const SSHKeyProvider& key_provider) const;
-    virtual Path derive_instances_dir(const Path& data_dir, const Path& backend_directory_name,
+    virtual Path derive_instances_dir(const Path& data_dir,
+                                      const Path& backend_directory_name,
                                       const Path& instances_subdir) const;
 
     // system info helpers

include/multipass/virtual_machine.h

@@ -92,7 +92,8 @@ class VirtualMachine : private DisabledCopyMove
     virtual int get_num_snapshots() const noexcept = 0;
     virtual std::shared_ptr<const Snapshot> get_snapshot(const std::string& name) const = 0;
     virtual std::shared_ptr<Snapshot> get_snapshot(const std::string& name) = 0;
-    virtual std::shared_ptr<const Snapshot> take_snapshot(const VMSpecs& specs, const std::string& name,
+    virtual std::shared_ptr<const Snapshot> take_snapshot(const VMSpecs& specs,
+                                                          const std::string& name,
                                                           const std::string& comment) = 0;
     virtual void delete_snapshot(const std::string& name) = 0;
     virtual void restore_snapshot(const std::string& name, VMSpecs& specs) = 0;

include/multipass/vm_image_vault.h

@@ -80,9 +80,13 @@ class VMImageVault : private DisabledCopyMove
     using PrepareAction = std::function<VMImage(const VMImage&)>;
 
     virtual ~VMImageVault() = default;
-    virtual VMImage fetch_image(const FetchType& fetch_type, const Query& query, const PrepareAction& prepare,
-                                const ProgressMonitor& monitor, const bool unlock,
-                                const std::optional<std::string>& checksum, const Path& save_dir) = 0;
+    virtual VMImage fetch_image(const FetchType& fetch_type,
+                                const Query& query,
+                                const PrepareAction& prepare,
+                                const ProgressMonitor& monitor,
+                                const bool unlock,
+                                const std::optional<std::string>& checksum,
+                                const Path& save_dir) = 0;
     virtual void remove(const std::string& name) = 0;
     virtual bool has_record_for(const std::string& name) = 0;
     virtual void prune_expired_images() = 0;

src/client/cli/cmd/delete.cpp

@@ -95,7 +95,8 @@ QString cmd::Delete::description() const
 
 mp::ParseCode cmd::Delete::parse_args(mp::ArgParser* parser)
 {
-    parser->addPositionalArgument("name", "Names of instances and snapshots to delete",
+    parser->addPositionalArgument("name",
+                                  "Names of instances and snapshots to delete",
                                   "<instance>[.snapshot] [<instance>[.snapshot] ...]");
 
     QCommandLineOption all_option(all_option_name, "Delete all instances and snapshots");
@@ -140,15 +141,19 @@ mp::ParseCode cmd::Delete::parse_instances_snapshots(mp::ArgParser* parser)
     return enforce_purged_snapshots(instances, snapshots, instance_found, snapshot_found);
 }
 
-mp::ParseCode cmd::Delete::enforce_purged_snapshots(std::string& instances, std::string& snapshots, bool instance_found,
+mp::ParseCode cmd::Delete::enforce_purged_snapshots(std::string& instances,
+                                                    std::string& snapshots,
+                                                    bool instance_found,
                                                     bool snapshot_found)
 {
     if (snapshot_found && !request.purge())
     {
         if (instance_found)
             cerr << fmt::format("{}:\n\n\tmultipass delete --purge {}\n\nYou can use a separate command to delete "
                                 "instances without purging them:\n\n\tmultipass delete {}\n",
-                                no_purge_base_error_msg, snapshots, instances);
+                                no_purge_base_error_msg,
+                                snapshots,
+                                instances);
         else
             cerr << fmt::format("{}.\n", no_purge_base_error_msg);
 

src/client/cli/cmd/delete.h

@@ -46,7 +46,9 @@ class Delete final : public Command
 
     ParseCode parse_args(ArgParser* parser);
     ParseCode parse_instances_snapshots(ArgParser* parser);
-    ParseCode enforce_purged_snapshots(std::string& instances, std::string& snapshots, bool instance_found,
+    ParseCode enforce_purged_snapshots(std::string& instances,
+                                       std::string& snapshots,
+                                       bool instance_found,
                                        bool snapshot_found);
 };
 } // namespace cmd

src/client/cli/cmd/info.cpp

@@ -58,7 +58,8 @@ QString cmd::Info::description() const
 
 mp::ParseCode cmd::Info::parse_args(mp::ArgParser* parser)
 {
-    parser->addPositionalArgument("instance", "Names of instances or snapshots to display information about",
+    parser->addPositionalArgument("instance",
+                                  "Names of instances or snapshots to display information about",
                                   "<instance>[.snapshot] [<instance>[.snapshot] ...]");
 
     QCommandLineOption all_option(all_option_name, "Display info for all instances");
@@ -69,7 +70,8 @@ mp::ParseCode cmd::Info::parse_args(mp::ArgParser* parser)
     QCommandLineOption formatOption(
         format_option_name,
         "Output info in the requested format.\nValid formats are: table (default), json, csv and yaml",
-        format_option_name, "table");
+        format_option_name,
+        "table");
 
     parser->addOptions({all_option, noRuntimeInfoOption, formatOption});
 

src/client/cli/cmd/remote_settings_handler.cpp

@@ -122,7 +122,10 @@ class RemoteSet : public RemoteSettingsCmd
         mp::AnimatedSpinner spinner{cout};
 
         [[maybe_unused]] auto ret =
-            dispatch(&RpcMethod::set, set_request, on_success<mp::SetReply>, on_failure,
+            dispatch(&RpcMethod::set,
+                     set_request,
+                     on_success<mp::SetReply>,
+                     on_failure,
                      mp::make_reply_spinner_callback<mp::SetRequest, mp::SetReply>(spinner, cerr));
         assert(ret == mp::ReturnCode::Ok && "should have thrown otherwise");
     }

src/client/cli/cmd/snapshot.cpp

@@ -45,7 +45,10 @@ mp::ReturnCode cmd::Snapshot::run(mp::ArgParser* parser)
     };
 
     spinner.start("Taking snapshot ");
-    return dispatch(&RpcMethod::snapshot, request, on_success, on_failure,
+    return dispatch(&RpcMethod::snapshot,
+                    request,
+                    on_success,
+                    on_failure,
                     make_logging_spinner_callback<SnapshotRequest, SnapshotReply>(spinner, cerr));
 }
 
@@ -72,8 +75,9 @@ mp::ParseCode cmd::Snapshot::parse_args(mp::ArgParser* parser)
                                 "names (see `help launch`). Default: \"snapshotN\", where N is one plus the "
                                 "number of snapshots that were ever taken for <instance>.",
                                 "name");
-    QCommandLineOption comment_opt{
-        {"comment", "c", "m"}, "An optional free comment to associate with the snapshot.", "comment"};
+    QCommandLineOption comment_opt{{"comment", "c", "m"},
+                                   "An optional free comment to associate with the snapshot.",
+                                   "comment"};
     parser->addOptions({name_opt, comment_opt});
 
     if (auto status = parser->commandParse(this); status != ParseCode::Ok)

src/client/cli/formatter/csv_formatter.cpp

@@ -73,14 +73,22 @@ std::string generate_snapshot_details(const mp::InfoReply reply)
     {
         const auto& fundamentals = info.snapshot_info().fundamentals();
 
-        fmt::format_to(std::back_inserter(buf), "{},{},{},{},{},", fundamentals.snapshot_name(), info.name(),
-                       info.cpu_count(), info.disk_total(), info.memory_total());
+        fmt::format_to(std::back_inserter(buf),
+                       "{},{},{},{},{},",
+                       fundamentals.snapshot_name(),
+                       info.name(),
+                       info.cpu_count(),
+                       info.disk_total(),
+                       info.memory_total());
 
         fmt::format_to(std::back_inserter(buf), format_mounts(info.mount_info()));
 
-        fmt::format_to(std::back_inserter(buf), ",{},{},{},\"{}\"\n",
+        fmt::format_to(std::back_inserter(buf),
+                       ",{},{},{},\"{}\"\n",
                        google::protobuf::util::TimeUtil::ToString(fundamentals.creation_timestamp()),
-                       fundamentals.parent(), fmt::join(info.snapshot_info().children(), ";"), fundamentals.comment());
+                       fundamentals.parent(),
+                       fmt::join(info.snapshot_info().children(), ";"),
+                       fundamentals.comment());
     }
 
     return fmt::to_string(buf);
@@ -101,18 +109,28 @@ std::string generate_instance_details(const mp::InfoReply reply)
                "outputting instance and snapshot details together is not supported in csv format");
         const auto& instance_details = info.instance_info();
 
-        fmt::format_to(std::back_inserter(buf), "{},{},{},{},{},{},{},{},{},{},{},{},", info.name(),
+        fmt::format_to(std::back_inserter(buf),
+                       "{},{},{},{},{},{},{},{},{},{},{},{},",
+                       info.name(),
                        mp::format::status_string_for(info.instance_status()),
                        instance_details.ipv4_size() ? instance_details.ipv4(0) : "",
-                       instance_details.ipv6_size() ? instance_details.ipv6(0) : "", instance_details.current_release(),
-                       instance_details.id(), instance_details.image_release(), instance_details.load(),
-                       instance_details.disk_usage(), info.disk_total(), instance_details.memory_usage(),
+                       instance_details.ipv6_size() ? instance_details.ipv6(0) : "",
+                       instance_details.current_release(),
+                       instance_details.id(),
+                       instance_details.image_release(),
+                       instance_details.load(),
+                       instance_details.disk_usage(),
+                       info.disk_total(),
+                       instance_details.memory_usage(),
                        info.memory_total());
 
         fmt::format_to(std::back_inserter(buf), format_mounts(info.mount_info()));
 
-        fmt::format_to(std::back_inserter(buf), ",{},{},{}\n", fmt::join(instance_details.ipv4(), ";"),
-                       info.cpu_count(), instance_details.num_snapshots());
+        fmt::format_to(std::back_inserter(buf),
+                       ",{},{},{}\n",
+                       fmt::join(instance_details.ipv4(), ";"),
+                       info.cpu_count(),
+                       instance_details.num_snapshots());
     }
 
     return fmt::to_string(buf);
@@ -146,8 +164,12 @@ std::string generate_snapshots_list(const mp::SnapshotsList& snapshot_list)
     for (const auto& item : mp::format::sorted(snapshot_list.snapshots()))
     {
         const auto& snapshot = item.fundamentals();
-        fmt::format_to(std::back_inserter(buf), "{},{},{},\"{}\"\n", item.name(), snapshot.snapshot_name(),
-                       snapshot.parent(), snapshot.comment());
+        fmt::format_to(std::back_inserter(buf),
+                       "{},{},{},\"{}\"\n",
+                       item.name(),
+                       snapshot.snapshot_name(),
+                       snapshot.parent(),
+                       snapshot.comment());
     }
 
     return fmt::to_string(buf);

src/client/cli/formatter/json_formatter.cpp

@@ -76,8 +76,9 @@ QJsonObject generate_snapshot_details(const mp::DetailedInfoItem& item)
     }
     snapshot_info.insert("mounts", mounts);
 
-    snapshot_info.insert("created", QString::fromStdString(
-                                        google::protobuf::util::TimeUtil::ToString(fundamentals.creation_timestamp())));
+    snapshot_info.insert(
+        "created",
+        QString::fromStdString(google::protobuf::util::TimeUtil::ToString(fundamentals.creation_timestamp())));
     snapshot_info.insert("parent", QString::fromStdString(fundamentals.parent()));
 
     QJsonArray children;