Delete reflect_module

Summary: Tearing out another piece of deprecated reflection Reviewed By: yoney Differential Revision: D66514234 fbshipit-source-id: 91de1bbaafbd39d251a9067046a0b43bced32529
facebook · Nov 27, 2024 · 201aeba · 201aeba
1 parent 135efee
commit 201aeba
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 853 deletions.
diff --git a/third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal.h.mustache b/third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal.h.mustache
@@ -117,6 +117,4 @@ class {{program:name}}_tags {
   using services = __fbthrift_services;
 };
 
-THRIFT_REGISTER_REFLECTION_METADATA({{program:name}}_tags::module, __fbthrift_refl::{{program:name}}_module_traits);
-
 {{ > common/namespace_cpp2_end}}
diff --git a/...d-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal_struct.h.mustache b/...d-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal_struct.h.mustache
@@ -144,7 +144,6 @@ class {{struct:cpp_name}}_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      {{program:name}}_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>({{struct:legacy_type_id}}ull)
   >;

diff --git a/third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal_union.h.mustache b/third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal_union.h.mustache
@@ -199,15 +199,13 @@ class {{struct:cpp_name}}_variant_traits {
 FATAL_REGISTER_ENUM_TRAITS(
   __fbthrift_refl::{{struct:cpp_name}}_tenum_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      {{program:name}}_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::{{struct:cpp_name}}_tenum_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(0ull)
   >
 );
 FATAL_REGISTER_VARIANT_TRAITS(
   __fbthrift_refl::{{struct:cpp_name}}_variant_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      {{program:name}}_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::{{struct:cpp_name}}_variant_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>({{struct:legacy_type_id}}ull)
   >

diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal.h b/third-party/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal.h
@@ -486,6 +486,4 @@ class module_tags {
   using services = __fbthrift_services;
 };
 
-THRIFT_REGISTER_REFLECTION_METADATA(module_tags::module, __fbthrift_refl::module_module_traits);
-
 } // namespace test_cpp2::cpp_reflection
diff --git a/...ty/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal_struct.h b/...ty/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal_struct.h
@@ -72,7 +72,6 @@ class structA_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(16040306389268712140ull)
   >;
@@ -168,7 +167,6 @@ class structB_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(17011230197513777036ull)
   >;
@@ -645,7 +643,6 @@ class structC_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(15703963988028277228ull)
   >;
@@ -762,7 +759,6 @@ class struct1_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(16486839729778550796ull)
   >;
@@ -894,7 +890,6 @@ class struct2_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(2030839855051909900ull)
   >;
@@ -1191,7 +1186,6 @@ class struct3_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(8845469880920676204ull)
   >;
@@ -1278,7 +1272,6 @@ class struct4_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(8628553040095454508ull)
   >;
@@ -1397,7 +1390,6 @@ class struct5_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(7967269041282488716ull)
   >;
@@ -1439,7 +1431,6 @@ class struct_binary_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(15392351242833807340ull)
   >;
@@ -1511,7 +1502,6 @@ class dep_A_struct_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(8602591000426722284ull)
   >;
@@ -1583,7 +1573,6 @@ class dep_B_struct_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(8784116305731192876ull)
   >;
@@ -1709,7 +1698,6 @@ class annotated_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(13050506750255744236ull)
   >;
@@ -2156,7 +2144,6 @@ class struct_with_special_names_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(1059263577269097804ull)
   >;
@@ -2280,7 +2267,6 @@ class struct_with_indirections_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(16986623410512473676ull)
   >;
@@ -2322,7 +2308,6 @@ class StructWithFieldAdapter_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(12839341089809937516ull)
   >;

diff --git a/...rty/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal_union.h b/...rty/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal_union.h
@@ -2144,95 +2144,83 @@ class UnionWithTypedefFieldAdapter_variant_traits {
 FATAL_REGISTER_ENUM_TRAITS(
   __fbthrift_refl::union1_tenum_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union1_tenum_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(0ull)
   >
 );
 FATAL_REGISTER_VARIANT_TRAITS(
   __fbthrift_refl::union1_variant_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union1_variant_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(15193987089687821868ull)
   >
 );
 FATAL_REGISTER_ENUM_TRAITS(
   __fbthrift_refl::union2_tenum_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union2_tenum_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(0ull)
   >
 );
 FATAL_REGISTER_VARIANT_TRAITS(
   __fbthrift_refl::union2_variant_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union2_variant_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(7436399996138825996ull)
   >
 );
 FATAL_REGISTER_ENUM_TRAITS(
   __fbthrift_refl::union3_tenum_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union3_tenum_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(0ull)
   >
 );
 FATAL_REGISTER_VARIANT_TRAITS(
   __fbthrift_refl::union3_variant_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union3_variant_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(12630661616538286124ull)
   >
 );
 FATAL_REGISTER_ENUM_TRAITS(
   __fbthrift_refl::unionA_tenum_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::unionA_tenum_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(0ull)
   >
 );
 FATAL_REGISTER_VARIANT_TRAITS(
   __fbthrift_refl::unionA_variant_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::unionA_variant_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(15005039916229430860ull)
   >
 );
 FATAL_REGISTER_ENUM_TRAITS(
   __fbthrift_refl::union_with_special_names_tenum_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union_with_special_names_tenum_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(0ull)
   >
 );
 FATAL_REGISTER_VARIANT_TRAITS(
   __fbthrift_refl::union_with_special_names_variant_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::union_with_special_names_variant_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(13162369197726992076ull)
   >
 );
 FATAL_REGISTER_ENUM_TRAITS(
   __fbthrift_refl::UnionWithTypedefFieldAdapter_tenum_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::UnionWithTypedefFieldAdapter_tenum_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(0ull)
   >
 );
 FATAL_REGISTER_VARIANT_TRAITS(
   __fbthrift_refl::UnionWithTypedefFieldAdapter_variant_traits,
   ::apache::thrift::detail::type_common_metadata_impl<
-      module_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_refl::UnionWithTypedefFieldAdapter_variant_traits::annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(10841541077214060908ull)
   >

diff --git a/...ift/src/thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2_enums/gen-cpp2/enums_fatal.h b/...ift/src/thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2_enums/gen-cpp2/enums_fatal.h
@@ -116,6 +116,4 @@ class enums_tags {
   using services = __fbthrift_services;
 };
 
-THRIFT_REGISTER_REFLECTION_METADATA(enums_tags::module, __fbthrift_refl::enums_module_traits);
-
 } // namespace facebook::ns::qwerty
diff --git a/.../thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2_enums/gen-cpp2/enums_fatal_struct.h b/.../thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2_enums/gen-cpp2/enums_fatal_struct.h
@@ -55,7 +55,6 @@ class SomeStruct_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      enums_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(10691278903523363788ull)
   >;

diff --git a/...piler/test/fixtures/mcpp2-compare/out/cpp2_extra_services/gen-cpp2/extra_services_fatal.h b/...piler/test/fixtures/mcpp2-compare/out/cpp2_extra_services/gen-cpp2/extra_services_fatal.h
@@ -117,6 +117,4 @@ class extra_services_tags {
   using services = __fbthrift_services;
 };
 
-THRIFT_REGISTER_REFLECTION_METADATA(extra_services_tags::module, __fbthrift_refl::extra_services_module_traits);
-
 } // namespace extra::svc
diff --git a/...est/fixtures/mcpp2-compare/out/cpp2_extra_services/gen-cpp2/extra_services_fatal_struct.h b/...est/fixtures/mcpp2-compare/out/cpp2_extra_services/gen-cpp2/extra_services_fatal_struct.h
@@ -236,7 +236,6 @@ class containerStruct2_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      extra_services_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(6698051510995854220ull)
   >;

diff --git a/...rift/compiler/test/fixtures/mcpp2-compare/out/cpp2_reflection/gen-cpp2/reflection_fatal.h b/...rift/compiler/test/fixtures/mcpp2-compare/out/cpp2_reflection/gen-cpp2/reflection_fatal.h
@@ -72,6 +72,4 @@ class reflection_tags {
   using services = __fbthrift_services;
 };
 
-THRIFT_REGISTER_REFLECTION_METADATA(reflection_tags::module, __fbthrift_refl::reflection_module_traits);
-
 } // namespace cpp2
diff --git a/...mpiler/test/fixtures/mcpp2-compare/out/cpp2_reflection/gen-cpp2/reflection_fatal_struct.h b/...mpiler/test/fixtures/mcpp2-compare/out/cpp2_reflection/gen-cpp2/reflection_fatal_struct.h
@@ -55,7 +55,6 @@ class ReflectionStruct_struct_traits {
   >;
   using members_annotations = __fbthrift_annotations::members;
   using metadata = ::apache::thrift::detail::type_common_metadata_impl<
-      reflection_tags::module,
       ::apache::thrift::reflected_annotations<__fbthrift_annotations>,
       static_cast<::apache::thrift::legacy_type_id_t>(16334935087599571500ull)
   >;

diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/cpp2/gen-cpp2/module_fatal.h b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/cpp2/gen-cpp2/module_fatal.h
@@ -321,6 +321,4 @@ class module_tags {
   using services = __fbthrift_services;
 };
 
-THRIFT_REGISTER_REFLECTION_METADATA(module_tags::module, __fbthrift_refl::module_module_traits);
-
 } // namespace apache::thrift::fixtures::types