Prepare carbon codegen for C++20 header units

Anton Likhtarov · meta-codesync[bot] · commit 77a346251fa5 · 2026-04-27T10:27:47.000-07:00
Summary:
Three small codegen changes to prepare consumers for C++20 header units

- Move *MessagesThrift.cpp from the thrift_library cpp2_srcs into the carbon-{Base}-messages cpp_library. *Messages.h was incorrectly duplicate-owned by both targets.
- Forward-declare {Base}RouterInfo in {Base}RouterInfoFwd.h so *ThriftTransport.h can be precompiled standalone.
- Emit full include paths in generated *.cpp so buck's header-interception matches.

Reviewed By: rlyerly

Differential Revision: D102255909

fbshipit-source-id: e5028dafd5e16ace25c411e5a6832e63ed907be8
diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeMessages.cpp b/mcrouter/lib/carbon/example/gen/HelloGoodbyeMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "HelloGoodbyeMessages.h"
+#include "mcrouter/lib/carbon/example/gen/HelloGoodbyeMessages.h"
 
 namespace hellogoodbye {
 
diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo-BuildExtraProvider.cpp b/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo-BuildExtraProvider.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "HelloGoodbyeRouterInfo.h"
+#include "mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.h"
 
 #include <mcrouter/routes/McExtraRouteHandleProvider.h>
 
diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo-ExternTemplate.cpp b/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo-ExternTemplate.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "HelloGoodbyeRouterInfo.h"
+#include "mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.h"
 
 #include <folly/dynamic.h>
 
diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.cpp b/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "HelloGoodbyeRouterInfo.h"
+#include "mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.h"
 
 #include <unordered_map>
 
diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfoFwd.h b/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfoFwd.h
@@ -38,6 +38,8 @@ class HelloRequest;
 
 namespace hellogoodbye {
 
+struct HelloGoodbyeRouterInfo;
+
 namespace detail {
 
 using HelloGoodbyeRoutableRequests = carbon::List<
diff --git a/mcrouter/lib/carbon/test/gen/AMessages.cpp b/mcrouter/lib/carbon/test/gen/AMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "AMessages.h"
+#include "mcrouter/lib/carbon/test/gen/AMessages.h"
 
 namespace carbon {
 namespace test {
diff --git a/mcrouter/lib/carbon/test/gen/ARouterInfo-BuildExtraProvider.cpp b/mcrouter/lib/carbon/test/gen/ARouterInfo-BuildExtraProvider.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "ARouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/ARouterInfo.h"
 
 #include <mcrouter/routes/McExtraRouteHandleProvider.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/ARouterInfo-ExternTemplate.cpp b/mcrouter/lib/carbon/test/gen/ARouterInfo-ExternTemplate.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "ARouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/ARouterInfo.h"
 
 #include <folly/dynamic.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/ARouterInfo.cpp b/mcrouter/lib/carbon/test/gen/ARouterInfo.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "ARouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/ARouterInfo.h"
 
 #include <unordered_map>
 
diff --git a/mcrouter/lib/carbon/test/gen/ARouterInfoFwd.h b/mcrouter/lib/carbon/test/gen/ARouterInfoFwd.h
@@ -38,6 +38,8 @@ namespace carbon {
 namespace test {
 namespace A {
 
+struct ARouterInfo;
+
 namespace detail {
 
 using ARoutableRequests = carbon::List<
diff --git a/mcrouter/lib/carbon/test/gen/BMessages.cpp b/mcrouter/lib/carbon/test/gen/BMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "BMessages.h"
+#include "mcrouter/lib/carbon/test/gen/BMessages.h"
 
 namespace carbon {
 namespace test {
diff --git a/mcrouter/lib/carbon/test/gen/BRouterInfo-BuildExtraProvider.cpp b/mcrouter/lib/carbon/test/gen/BRouterInfo-BuildExtraProvider.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "BRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/BRouterInfo.h"
 
 #include <mcrouter/routes/McExtraRouteHandleProvider.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/BRouterInfo-ExternTemplate.cpp b/mcrouter/lib/carbon/test/gen/BRouterInfo-ExternTemplate.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "BRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/BRouterInfo.h"
 
 #include <folly/dynamic.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/BRouterInfo.cpp b/mcrouter/lib/carbon/test/gen/BRouterInfo.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "BRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/BRouterInfo.h"
 
 #include <unordered_map>
 
diff --git a/mcrouter/lib/carbon/test/gen/BRouterInfoFwd.h b/mcrouter/lib/carbon/test/gen/BRouterInfoFwd.h
@@ -38,6 +38,8 @@ namespace carbon {
 namespace test {
 namespace B {
 
+struct BRouterInfo;
+
 namespace detail {
 
 using BRoutableRequests = carbon::List<
diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestMessages.cpp b/mcrouter/lib/carbon/test/gen/CarbonTestMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonTestMessages.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonTestMessages.h"
 
 namespace carbon {
 namespace test {
diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo-BuildExtraProvider.cpp b/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo-BuildExtraProvider.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonTestRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.h"
 
 #include <mcrouter/routes/McExtraRouteHandleProvider.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo-ExternTemplate.cpp b/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo-ExternTemplate.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonTestRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.h"
 
 #include <folly/dynamic.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.cpp b/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonTestRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.h"
 
 #include <unordered_map>
 
diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfoFwd.h b/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfoFwd.h
@@ -39,6 +39,8 @@ class McVersionRequest;
 namespace carbon {
 namespace test {
 
+struct CarbonTestRouterInfo;
+
 namespace detail {
 
 using CarbonTestRoutableRequests = carbon::List<
diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestMessages.cpp b/mcrouter/lib/carbon/test/gen/CarbonThriftTestMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonThriftTestMessages.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonThriftTestMessages.h"
 
 namespace carbon {
 namespace test {
diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo-BuildExtraProvider.cpp b/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo-BuildExtraProvider.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonThriftTestRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.h"
 
 #include <mcrouter/routes/McExtraRouteHandleProvider.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo-ExternTemplate.cpp b/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo-ExternTemplate.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonThriftTestRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.h"
 
 #include <folly/dynamic.h>
 
diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.cpp b/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonThriftTestRouterInfo.h"
+#include "mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.h"
 
 #include <unordered_map>
 
diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfoFwd.h b/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfoFwd.h
@@ -41,6 +41,8 @@ class McVersionRequest;
 namespace carbon {
 namespace test {
 
+struct CarbonThriftTestRouterInfo;
+
 namespace detail {
 
 using CarbonThriftTestRoutableRequests = carbon::List<
diff --git a/mcrouter/lib/network/gen/CommonMessages.cpp b/mcrouter/lib/network/gen/CommonMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CommonMessages.h"
+#include "mcrouter/lib/network/gen/CommonMessages.h"
 
 namespace facebook {
 namespace memcache {
diff --git a/mcrouter/lib/network/gen/MemcacheMessages.cpp b/mcrouter/lib/network/gen/MemcacheMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "MemcacheMessages.h"
+#include "mcrouter/lib/network/gen/MemcacheMessages.h"
 
 namespace facebook {
 namespace memcache {
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo-AllFastestRoute.cpp b/mcrouter/lib/network/gen/MemcacheRouterInfo-AllFastestRoute.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "MemcacheRouterInfo.h"
+#include "mcrouter/lib/network/gen/MemcacheRouterInfo.h"
 
 #include <mcrouter/routes/AllFastestRouteFactory.h>
 
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo-BuildExtraProvider.cpp b/mcrouter/lib/network/gen/MemcacheRouterInfo-BuildExtraProvider.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "MemcacheRouterInfo.h"
+#include "mcrouter/lib/network/gen/MemcacheRouterInfo.h"
 
 #include <mcrouter/routes/McExtraRouteHandleProvider.h>
 
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo-ExternTemplate.cpp b/mcrouter/lib/network/gen/MemcacheRouterInfo-ExternTemplate.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "MemcacheRouterInfo.h"
+#include "mcrouter/lib/network/gen/MemcacheRouterInfo.h"
 
 #include <folly/dynamic.h>
 
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo-FailoverRoute.cpp b/mcrouter/lib/network/gen/MemcacheRouterInfo-FailoverRoute.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "MemcacheRouterInfo.h"
+#include "mcrouter/lib/network/gen/MemcacheRouterInfo.h"
 
 #include <mcrouter/routes/FailoverRoute.h>
 
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo-HashRoute.cpp b/mcrouter/lib/network/gen/MemcacheRouterInfo-HashRoute.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "MemcacheRouterInfo.h"
+#include "mcrouter/lib/network/gen/MemcacheRouterInfo.h"
 
 #include <mcrouter/routes/HashRouteFactory.h>
 
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo.cpp b/mcrouter/lib/network/gen/MemcacheRouterInfo.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "MemcacheRouterInfo.h"
+#include "mcrouter/lib/network/gen/MemcacheRouterInfo.h"
 
 #include <unordered_map>
 
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfoFwd.h b/mcrouter/lib/network/gen/MemcacheRouterInfoFwd.h
@@ -70,6 +70,8 @@ class McVersionRequest;
 namespace facebook {
 namespace memcache {
 
+struct MemcacheRouterInfo;
+
 namespace detail {
 
 using MemcacheRoutableRequests = carbon::List<
diff --git a/mcrouter/lib/network/test/gen/CarbonTestMessages.cpp b/mcrouter/lib/network/test/gen/CarbonTestMessages.cpp
@@ -12,7 +12,7 @@
  *
  *  @generated
  */
-#include "CarbonTestMessages.h"
+#include "mcrouter/lib/network/test/gen/CarbonTestMessages.h"
 
 namespace facebook {
 namespace memcache {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`* @generated`
`14`	`14`	`*/`
`15`		`-#include "HelloGoodbyeMessages.h"`
	`15`	`+#include "mcrouter/lib/carbon/example/gen/HelloGoodbyeMessages.h"`
`16`	`16`
`17`	`17`	`namespace hellogoodbye {`
`18`	`18`