iwyu: fix add/remove include errors

Author: ryanofsky

example/calculator.cpp

@@ -3,17 +3,21 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <calculator.h>
+#include <init.capnp.h>
+#include <init.capnp.proxy.h> // NOLINT(misc-include-cleaner) // IWYU pragma: keep
+
 #include <charconv>
+#include <cstring>
 #include <fstream>
-#include <init.capnp.h>
-#include <init.capnp.proxy.h> // NOLINT(misc-include-cleaner)
-#include <init.h>
 #include <iostream>
+#include <kj/async.h>
+#include <kj/common.h>
+#include <kj/memory.h>
 #include <memory>
 #include <mp/proxy-io.h>
-#include <printer.h>
 #include <stdexcept>
 #include <string>
+#include <system_error>
 #include <utility>
 
 class CalculatorImpl : public Calculator

example/example.cpp

@@ -2,12 +2,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <init.capnp.h>
+#include <init.capnp.proxy.h>
+
+#include <cstring> // IWYU pragma: keep
 #include <filesystem>
 #include <fstream>
 #include <future>
-#include <init.capnp.h>
-#include <init.capnp.proxy.h>
 #include <iostream>
+#include <kj/async.h>
+#include <kj/common.h>
+#include <memory>
 #include <mp/proxy-io.h>
 #include <mp/util.h>
 #include <stdexcept>

example/init.capnp

@@ -12,8 +12,7 @@ using Printer = import "printer.capnp";
 $Proxy.include("calculator.h");
 $Proxy.include("init.h");
 $Proxy.include("printer.h");
-$Proxy.includeTypes("calculator.capnp.proxy-types.h");
-$Proxy.includeTypes("printer.capnp.proxy-types.h");
+$Proxy.includeTypes("types.h");
 
 interface InitInterface $Proxy.wrap("Init") {
     construct @0 (threadMap: Proxy.ThreadMap) -> (threadMap :Proxy.ThreadMap);

example/printer.cpp

@@ -2,17 +2,23 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <printer.h>
+
+#include <init.capnp.h>
+#include <init.capnp.proxy.h> // NOLINT(misc-include-cleaner) // IWYU pragma: keep
+
 #include <charconv>
+#include <cstring>
 #include <fstream>
-#include <init.capnp.h>
-#include <init.capnp.proxy.h> // NOLINT(misc-include-cleaner)
-#include <init.h>
 #include <iostream>
+#include <kj/async.h>
+#include <kj/common.h>
+#include <kj/memory.h>
 #include <memory>
 #include <mp/proxy-io.h>
-#include <printer.h>
 #include <stdexcept>
 #include <string>
+#include <system_error>
 
 class PrinterImpl : public Printer
 {

example/types.h

@@ -5,10 +5,19 @@
 #ifndef EXAMPLE_TYPES_H
 #define EXAMPLE_TYPES_H
 
+#include <calculator.capnp.proxy-types.h>
+#include <printer.capnp.proxy-types.h>
+
+// IWYU pragma: begin_exports
 #include <mp/type-context.h>
 #include <mp/type-decay.h>
 #include <mp/type-interface.h>
 #include <mp/type-string.h>
 #include <mp/type-threadmap.h>
+// IWYU pragma: end_exports
+
+struct InitInterface; // IWYU pragma: export
+struct CalculatorInterface; // IWYU pragma: export
+struct PrinterInterface; // IWYU pragma: export
 
 #endif // EXAMPLE_TYPES_H

include/mp/proxy-io.h

@@ -13,13 +13,15 @@
 #include <capnp/rpc-twoparty.h>
 
 #include <assert.h>
+#include <condition_variable>
 #include <functional>
 #include <kj/function.h>
 #include <map>
 #include <memory>
 #include <optional>
 #include <sstream>
 #include <string>
+#include <thread>
 
 namespace mp {
 struct ThreadContext;

include/mp/proxy.h

@@ -7,35 +7,31 @@
 
 #include <mp/util.h>
 
-#include <array>
 #include <cassert>
 #include <functional>
 #include <list>
+#include <memory>
 #include <stddef.h>
 #include <tuple>
 #include <type_traits>
 #include <utility>
+#include <variant> // IWYU pragma: keep
 
 namespace mp {
 class Connection;
 class EventLoop;
 //! Mapping from capnp interface type to proxy client implementation (specializations are generated by
 //! proxy-codegen.cpp).
-template <typename Interface>
-struct ProxyClient;
+template <typename Interface> struct ProxyClient; // IWYU pragma: export
 //! Mapping from capnp interface type to proxy server implementation (specializations are generated by
 //! proxy-codegen.cpp).
-template <typename Interface>
-struct ProxyServer;
+template <typename Interface> struct ProxyServer; // IWYU pragma: export
 //! Mapping from capnp method params type to method traits (specializations are generated by proxy-codegen.cpp).
-template <typename Params>
-struct ProxyMethod;
+template <typename Params> struct ProxyMethod; // IWYU pragma: export
 //! Mapping from capnp struct type to struct traits (specializations are generated by proxy-codegen.cpp).
-template <typename Struct>
-struct ProxyStruct;
+template <typename Struct> struct ProxyStruct; // IWYU pragma: export
 //! Mapping from local c++ type to capnp type and traits (specializations are generated by proxy-codegen.cpp).
-template <typename Type>
-struct ProxyType;
+template <typename Type> struct ProxyType; // IWYU pragma: export
 
 using CleanupList = std::list<std::function<void()>>;
 using CleanupIt = typename CleanupList::iterator;

include/mp/util.h

@@ -8,14 +8,10 @@
 #include <capnp/schema.h>
 #include <cassert>
 #include <cstddef>
+#include <cstring>
 #include <functional>
-#include <future>
-#include <kj/common.h>
-#include <kj/exception.h>
 #include <kj/string-tree.h>
-#include <memory>
 #include <mutex>
-#include <string.h>
 #include <string>
 #include <tuple>
 #include <type_traits>

src/mp/gen.cpp

@@ -6,13 +6,15 @@
 #include <mp/util.h>
 
 #include <algorithm>
+#include <capnp/schema.h>
 #include <capnp/schema-parser.h>
+#include <cerrno>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
-#include <errno.h>
 #include <fstream>
 #include <functional>
+#include <initializer_list>
 #include <iostream>
 #include <kj/array.h>
 #include <kj/common.h>
@@ -26,6 +28,7 @@
 #include <string>
 #include <system_error>
 #include <unistd.h>
+#include <utility>
 #include <vector>
 
 #define PROXY_BIN "mpgen"
@@ -198,19 +201,45 @@ static void Generate(kj::StringPtr src_prefix,
 
     std::ofstream cpp_server(output_path + ".proxy-server.c++");
     cpp_server << "// Generated by " PROXY_BIN " from " << src_file << "\n\n";
+    cpp_server << "// IWYU pragma: no_include <kj/memory.h>\n";
+    cpp_server << "// IWYU pragma: no_include <memory>\n";
+    cpp_server << "// IWYU pragma: begin_keep\n";
+    cpp_server << "#include <" << include_path << ".proxy.h>\n";
     cpp_server << "#include <" << include_path << ".proxy-types.h>\n";
-    cpp_server << "#include <" << PROXY_TYPES << ">\n\n";
+    cpp_server << "#include <capnp/generated-header-support.h>\n";
+    cpp_server << "#include <cstring>\n";
+    cpp_server << "#include <kj/async.h>\n";
+    cpp_server << "#include <kj/common.h>\n";
+    cpp_server << "#include <kj/exception.h>\n";
+    cpp_server << "#include <mp/proxy.h>\n";
+    cpp_server << "#include <mp/util.h>\n";
+    cpp_server << "#include <" << PROXY_TYPES << ">\n";
+    cpp_server << "// IWYU pragma: end_keep\n\n";
     cpp_server << "namespace mp {\n";
 
     std::ofstream cpp_client(output_path + ".proxy-client.c++");
     cpp_client << "// Generated by " PROXY_BIN " from " << src_file << "\n\n";
+    cpp_client << "// IWYU pragma: no_include <kj/memory.h>\n";
+    cpp_client << "// IWYU pragma: no_include <memory>\n";
+    cpp_client << "// IWYU pragma: begin_keep\n";
+    cpp_client << "#include <" << include_path << ".h>\n";
+    cpp_client << "#include <" << include_path << ".proxy.h>\n";
     cpp_client << "#include <" << include_path << ".proxy-types.h>\n";
-    cpp_client << "#include <" << PROXY_TYPES << ">\n\n";
+    cpp_client << "#include <capnp/generated-header-support.h>\n";
+    cpp_client << "#include <cstring>\n";
+    cpp_client << "#include <kj/common.h>\n";
+    cpp_client << "#include <mp/proxy.h>\n";
+    cpp_client << "#include <mp/util.h>\n";
+    cpp_client << "#include <" << PROXY_TYPES << ">\n";
+    cpp_client << "// IWYU pragma: end_keep\n\n";
     cpp_client << "namespace mp {\n";
 
     std::ofstream cpp_types(output_path + ".proxy-types.c++");
     cpp_types << "// Generated by " PROXY_BIN " from " << src_file << "\n\n";
-    cpp_types << "#include <" << include_path << ".proxy-types.h>\n";
+    cpp_types << "// IWYU pragma: no_include \"mp/proxy.h\"\n";
+    cpp_types << "// IWYU pragma: no_include \"mp/proxy-io.h\"\n";
+    cpp_types << "#include <" << include_path << ".proxy.h>\n";
+    cpp_types << "#include <" << include_path << ".proxy-types.h> // IWYU pragma: keep\n";
     cpp_types << "#include <" << PROXY_TYPES << ">\n\n";
     cpp_types << "namespace mp {\n";
 
@@ -226,10 +255,12 @@ static void Generate(kj::StringPtr src_prefix,
     inl << "// Generated by " PROXY_BIN " from " << src_file << "\n\n";
     inl << "#ifndef " << guard << "_PROXY_TYPES_H\n";
     inl << "#define " << guard << "_PROXY_TYPES_H\n\n";
-    inl << "#include <" << include_path << ".proxy.h>\n";
+    inl << "// IWYU pragma: no_include \"mp/proxy.h\"\n";
+    inl << "#include <mp/proxy.h> // IWYU pragma: keep\n";
+    inl << "#include <" << include_path << ".proxy.h> // IWYU pragma: keep\n";
     for (const auto annotation : file_schema.getProto().getAnnotations()) {
         if (annotation.getId() == INCLUDE_TYPES_ANNOTATION_ID) {
-            inl << "#include <" << annotation.getValue().getText() << ">\n";
+            inl << "#include \"" << annotation.getValue().getText() << "\" // IWYU pragma: export\n";
         }
     }
     inl << "namespace mp {\n";
@@ -238,10 +269,10 @@ static void Generate(kj::StringPtr src_prefix,
     h << "// Generated by " PROXY_BIN " from " << src_file << "\n\n";
     h << "#ifndef " << guard << "_PROXY_H\n";
     h << "#define " << guard << "_PROXY_H\n\n";
-    h << "#include <" << include_path << ".h>\n";
+    h << "#include <" << include_path << ".h> // IWYU pragma: keep\n";
     for (const auto annotation : file_schema.getProto().getAnnotations()) {
         if (annotation.getId() == INCLUDE_ANNOTATION_ID) {
-            h << "#include <" << annotation.getValue().getText() << ">\n";
+            h << "#include \"" << annotation.getValue().getText() << "\" // IWYU pragma: export\n";
         }
     }
     h << "#include <" << PROXY_DECL << ">\n\n";

src/mp/proxy.cpp

@@ -10,24 +10,23 @@
 #include <mp/type-threadmap.h>
 #include <mp/util.h>
 
-#include <assert.h>
 #include <atomic>
-#include <capnp/blob.h>
 #include <capnp/capability.h>
+#include <capnp/rpc.h>
 #include <condition_variable>
 #include <functional>
 #include <future>
-#include <kj/async-io.h>
 #include <kj/async.h>
+#include <kj/async-io.h>
+#include <kj/async-prelude.h>
 #include <kj/common.h>
 #include <kj/debug.h>
-#include <kj/exception.h>
 #include <kj/function.h>
 #include <kj/memory.h>
 #include <map>
 #include <memory>
 #include <mutex>
-#include <stddef.h>
+#include <optional>
 #include <stdexcept>
 #include <string>
 #include <sys/socket.h>
@@ -38,9 +37,6 @@
 
 namespace mp {
 
-template <typename Interface>
-struct ProxyServer;
-
 thread_local ThreadContext g_thread_context;
 
 void LoggingErrorHandler::taskFailed(kj::Exception&& exception)