Enforce misc-include-cleaner on common/libs/confui

Bug: b/523396865

Author: Databean

base/cvd/BUILD.bazel

@@ -30,6 +30,7 @@ filegroup(
         ".clang-tidy",
         "//allocd:.clang-tidy",
         "//cuttlefish/common:.clang-tidy",
+        "//cuttlefish/common/libs/confui:.clang-tidy",
         "//cuttlefish/common/libs/key_equals_value:.clang-tidy",
         "//cuttlefish/common/libs/transport:.clang-tidy",
         "//cuttlefish/host:.clang-tidy",

base/cvd/cuttlefish/common/libs/confui/BUILD.bazel

@@ -4,6 +4,8 @@ package(
     default_visibility = ["//:android_cuttlefish"],
 )
 
+exports_files([".clang-tidy"])
+
 cf_cc_library(
     name = "packet",
     srcs = ["packet.cpp"],

base/cvd/cuttlefish/common/libs/confui/packet.cpp

@@ -17,17 +17,21 @@
 
 #include <stdint.h>
 
-#include <algorithm>
+#include <memory>
 #include <optional>
 #include <string>
 #include <vector>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_split.h"
 
-namespace cuttlefish {
-namespace confui {
-namespace packet {
+#include "cuttlefish/common/libs/confui/packet_types.h"
+#include "cuttlefish/common/libs/confui/utils.h"
+#include "cuttlefish/common/libs/fs/shared_buf.h"
+#include "cuttlefish/common/libs/fs/shared_fd.h"
+
+namespace cuttlefish::confui::packet {
+
 static std::optional<std::vector<uint8_t>> ReadRawData(SharedFD s) {
   if (!s->IsOpen()) {
     ConfUiLog(ERROR) << "file, socket, etc, is not open to read";
@@ -159,6 +163,5 @@ std::optional<ParsedPacket> ReadPayload(SharedFD s) {
   }
   return parsed_result;
 }
-}  // end of namespace packet
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+
+}  // namespace cuttlefish::confui::packet

base/cvd/cuttlefish/common/libs/confui/packet.h

@@ -17,11 +17,9 @@
 
 #include <stdint.h>
 
-#include <algorithm>
 #include <optional>
+#include <sstream>
 #include <string>
-#include <tuple>
-#include <type_traits>
 #include <vector>
 
 #include "cuttlefish/common/libs/confui/packet_types.h"
@@ -49,9 +47,7 @@
  * is the binary representation of the i th item
  *
  */
-namespace cuttlefish {
-namespace confui {
-namespace packet {
+namespace cuttlefish::confui::packet {
 
 /*
  * methods in namespace impl is not intended for public use
@@ -60,6 +56,7 @@ namespace packet {
  * or, skip the namespace impl
  */
 namespace impl {
+
 template <typename Buffer, typename... Args>
 void AppendToBuffer(Buffer& buffer, Args&&... args) {
   (buffer.insert(buffer.end(), std::begin(std::forward<Args>(args)),
@@ -97,6 +94,7 @@ Payload ToPayload(const std::string& cmd_str, const std::string& session_id,
   ph.payload_length_ = payload_buffer.size();
   return {ph, payload_buffer};
 }
+
 }  // namespace impl
 
 /*
@@ -130,6 +128,4 @@ bool WritePayload(SharedFD d, const std::string& cmd_str,
   return true;
 }
 
-}  // end of namespace packet
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+}  // namespace cuttlefish::confui::packet

base/cvd/cuttlefish/common/libs/confui/packet_types.cpp

@@ -15,15 +15,18 @@
 
 #include "cuttlefish/common/libs/confui/packet_types.h"
 
+#include <stdint.h>
+
 #include <sstream>
+#include <string>
+#include <vector>
+
+namespace cuttlefish::confui::packet {
 
-namespace cuttlefish {
-namespace confui {
-namespace packet {
 std::string ToString(const ParsedPacket& packet) {
   std::stringstream ss;
   ss << "[" << packet.session_id_ << "," << packet.type_ << ",";
-  for (auto const& vec : packet.additional_info_) {
+  for (const std::vector<uint8_t>& vec : packet.additional_info_) {
     if (vec.empty()) {
       ss << ",";
       continue;
@@ -39,6 +42,5 @@ std::string ToString(const ParsedPacket& packet) {
   result.append("]");
   return result;
 }
-}  // end of namespace packet
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+
+}  // namespace cuttlefish::confui::packet

base/cvd/cuttlefish/common/libs/confui/packet_types.h

@@ -17,14 +17,12 @@
 
 #include <stdint.h>
 
-#include <sstream>
 #include <string>
 #include <tuple>
 #include <vector>
 
-namespace cuttlefish {
-namespace confui {
-namespace packet {
+namespace cuttlefish::confui::packet {
+
 struct PayloadHeader {
   uint32_t payload_length_;
 };
@@ -38,13 +36,13 @@ using Payload = std::tuple<PayloadHeader, BufferType>;
 constexpr const ssize_t kMaxPayloadLength = 10000;
 
 using ConfUiPacketInfo = std::vector<std::vector<uint8_t>>;
+
 struct ParsedPacket {
   std::string session_id_;
   std::string type_;
   ConfUiPacketInfo additional_info_;
 };
 
 std::string ToString(const ParsedPacket& packet);
-}  // end of namespace packet
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+
+}  // namespace cuttlefish::confui::packet

base/cvd/cuttlefish/common/libs/confui/protocol.cpp

@@ -17,18 +17,23 @@
 
 #include <stdint.h>
 
-#include <sstream>
+#include <memory>
+#include <string>
 #include <vector>
 
 #include "absl/strings/str_split.h"
+#include "teeui/common_message_types.h"  // /system/teeui/libteeui/.../include
 
 #include "cuttlefish/common/libs/confui/packet.h"
+#include "cuttlefish/common/libs/confui/packet_types.h"
+#include "cuttlefish/common/libs/confui/protocol_types.h"
 #include "cuttlefish/common/libs/confui/utils.h"
-#include "cuttlefish/common/libs/fs/shared_buf.h"
+#include "cuttlefish/common/libs/fs/shared_fd.h"
+
+namespace cuttlefish::confui {
 
-namespace cuttlefish {
-namespace confui {
 namespace {
+
 // default implementation of ToConfUiMessage
 template <ConfUiCmd C>
 std::unique_ptr<ConfUiMessage> ToConfUiMessage(
@@ -82,7 +87,8 @@ std::unique_ptr<ConfUiMessage> ToConfUiMessage(
   }
   return {nullptr};
 }
-}  // end of unnamed namespace
+
+}  // namespace
 
 std::string ToString(const ConfUiMessage& msg) { return msg.ToString(); }
 
@@ -160,6 +166,7 @@ bool SendUserSelection(SharedFD fd, const std::string& session_id,
 
 // specialized ToConfUiMessage()
 namespace {
+
 template <>
 std::unique_ptr<ConfUiMessage> ToConfUiMessage<ConfUiCmd::kCliAck>(
     const packet::ParsedPacket& message) {
@@ -270,6 +277,6 @@ std::unique_ptr<ConfUiMessage> ToConfUiMessage<ConfUiCmd::kCliRespond>(
   return std::make_unique<ConfUiCliResponseMessage>(message.session_id_,
                                                     response, sign, msg);
 }
-}  // end of unnamed namespace
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+
+}  // namespace
+}  // namespace cuttlefish::confui

base/cvd/cuttlefish/common/libs/confui/protocol.h

@@ -23,12 +23,10 @@
 
 #include "teeui/common_message_types.h"  // /system/teeui/libteeui/.../include
 
-#include "cuttlefish/common/libs/confui/packet_types.h"
 #include "cuttlefish/common/libs/confui/protocol_types.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 
-namespace cuttlefish {
-namespace confui {
+namespace cuttlefish::confui {
 
 std::string ToString(const ConfUiMessage& msg);
 
@@ -46,7 +44,7 @@ std::unique_ptr<ConfUiMessage> RecvConfUiMsg(const std::string& session_id,
 
 bool SendAbortCmd(SharedFD fd, const std::string& session_id);
 
-bool SendAck(SharedFD fd, const std::string& session_id, const bool is_success,
+bool SendAck(SharedFD fd, const std::string& session_id, bool is_success,
              const std::string& status_message);
 bool SendResponse(SharedFD fd, const std::string& session_id,
                   const UserResponse::type& plain_selection,
@@ -67,5 +65,4 @@ bool SendStopCmd(SharedFD fd, const std::string& session_id);
 bool SendUserSelection(SharedFD fd, const std::string& session_id,
                        const UserResponse::type& confirm_cancel);
 
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+}  // namespace cuttlefish::confui

base/cvd/cuttlefish/common/libs/confui/protocol_types.cpp

@@ -18,16 +18,20 @@
 #include <stdint.h>
 
 #include <map>
+#include <optional>
 #include <sstream>
+#include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "cuttlefish/common/libs/confui/packet.h"
+#include "teeui/common_message_types.h"  // /system/teeui/libteeui/.../include
+
 #include "cuttlefish/common/libs/confui/utils.h"
+#include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/contains.h"
 
-namespace cuttlefish {
-namespace confui {
+namespace cuttlefish::confui {
+
 std::string ToDebugString(const ConfUiCmd& cmd, const bool is_verbose) {
   std::stringstream ss;
   ss << " of " << Enum2Base(cmd);
@@ -174,5 +178,4 @@ bool ConfUiUserTouchMessage::SendOver(SharedFD fd) {
                std::to_string(y_));
 }
 
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+}  // namespace cuttlefish::confui

base/cvd/cuttlefish/common/libs/confui/protocol_types.h

@@ -28,8 +28,8 @@
 #include "cuttlefish/common/libs/confui/utils.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 
-namespace cuttlefish {
-namespace confui {
+namespace cuttlefish::confui {
+
 // When you update this, please update all the utility functions
 // in conf.cpp: e.g. ToString, etc
 enum class ConfUiCmd : uint32_t {
@@ -47,11 +47,11 @@ enum class ConfUiCmd : uint32_t {
 constexpr const ssize_t kMaxMessageLength = packet::kMaxPayloadLength;
 
 std::string ToString(const ConfUiCmd& cmd);
-std::string ToDebugString(const ConfUiCmd& cmd, const bool is_verbose);
+std::string ToDebugString(const ConfUiCmd& cmd, bool is_verbose);
 ConfUiCmd ToCmd(const std::string& cmd_str);
 ConfUiCmd ToCmd(uint32_t i);
 
-std::string ToString(const teeui::UIOption ui_opt);
+std::string ToString(teeui::UIOption ui_opt);
 std::optional<teeui::UIOption> ToUiOption(const std::string&);
 
 struct HostError {
@@ -228,5 +228,4 @@ class ConfUiUserTouchMessage : public ConfUiMessage {
 using ConfUiAbortMessage = ConfUiGenericMessage<ConfUiCmd::kAbort>;
 using ConfUiStopMessage = ConfUiGenericMessage<ConfUiCmd::kStop>;
 
-}  // end of namespace confui
-}  // end of namespace cuttlefish
+}  // namespace cuttlefish::confui