Skip to content

Commit 4da410f

Browse files
Mizuchimeta-codesync[bot]
Mizuchi
authored and
meta-codesync[bot]
committed
Delete dead code
Reviewed By: yfeldblum Differential Revision: D87939932 fbshipit-source-id: 9a7adf33376a36ddf4640d44e47f25bc54b8c6f3
1 parent 035a740 commit 4da410f

File tree

10 files changed

+68
-163
lines changed

10 files changed

+68
-163
lines changed

‎third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal_struct.h.mustache‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ class {{struct:cpp_name}}_struct_traits {
131131
{{/struct:fields}}
132132
>;
133133
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
134-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
135-
static_cast<::apache::thrift::legacy_type_id_t>({{struct:legacy_type_id}}ull)
134+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
136135
>;
137136
};
138137

‎third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_fatal_union.h.mustache‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,13 @@ class {{struct:cpp_name}}_variant_traits {
202202
FATAL_REGISTER_ENUM_TRAITS(
203203
__fbthrift_refl::{{struct:cpp_name}}_tenum_traits,
204204
::apache::thrift::detail::type_common_metadata_impl<
205-
::apache::thrift::reflected_annotations<__fbthrift_refl::{{struct:cpp_name}}_tenum_traits::annotations>,
206-
static_cast<::apache::thrift::legacy_type_id_t>(0ull)
205+
::apache::thrift::reflected_annotations<__fbthrift_refl::{{struct:cpp_name}}_tenum_traits::annotations>
207206
>
208207
);
209208
FATAL_REGISTER_VARIANT_TRAITS(
210209
__fbthrift_refl::{{struct:cpp_name}}_variant_traits,
211210
::apache::thrift::detail::type_common_metadata_impl<
212-
::apache::thrift::reflected_annotations<__fbthrift_refl::{{struct:cpp_name}}_variant_traits::annotations>,
213-
static_cast<::apache::thrift::legacy_type_id_t>({{struct:legacy_type_id}}ull)
211+
::apache::thrift::reflected_annotations<__fbthrift_refl::{{struct:cpp_name}}_variant_traits::annotations>
214212
>
215213
);
216214
{{/struct:union?}}{{/program:structs}}

‎third-party/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal_struct.h‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ class structA_struct_traits {
5959
member::b
6060
>;
6161
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
62-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
63-
static_cast<::apache::thrift::legacy_type_id_t>(16040306389268712140ull)
62+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
6463
>;
6564
};
6665

@@ -141,8 +140,7 @@ class structB_struct_traits {
141140
member::d
142141
>;
143142
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
144-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
145-
static_cast<::apache::thrift::legacy_type_id_t>(17011230197513777036ull)
143+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
146144
>;
147145
};
148146

@@ -436,8 +434,7 @@ class structC_struct_traits {
436434
member::o3
437435
>;
438436
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
439-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
440-
static_cast<::apache::thrift::legacy_type_id_t>(15703963988028277228ull)
437+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
441438
>;
442439
};
443440

@@ -515,8 +512,7 @@ class struct1_struct_traits {
515512
member::field5
516513
>;
517514
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
518-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
519-
static_cast<::apache::thrift::legacy_type_id_t>(16486839729778550796ull)
515+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
520516
>;
521517
};
522518

@@ -603,8 +599,7 @@ class struct2_struct_traits {
603599
member::fieldG
604600
>;
605601
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
606-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
607-
static_cast<::apache::thrift::legacy_type_id_t>(2030839855051909900ull)
602+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
608603
>;
609604
};
610605

@@ -790,8 +785,7 @@ class struct3_struct_traits {
790785
member::fieldR
791786
>;
792787
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
793-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
794-
static_cast<::apache::thrift::legacy_type_id_t>(8845469880920676204ull)
788+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
795789
>;
796790
};
797791

@@ -851,8 +845,7 @@ class struct4_struct_traits {
851845
member::field3
852846
>;
853847
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
854-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
855-
static_cast<::apache::thrift::legacy_type_id_t>(8628553040095454508ull)
848+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
856849
>;
857850
};
858851

@@ -938,8 +931,7 @@ class struct5_struct_traits {
938931
member::field4
939932
>;
940933
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
941-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
942-
static_cast<::apache::thrift::legacy_type_id_t>(7967269041282488716ull)
934+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
943935
>;
944936
};
945937

@@ -972,8 +964,7 @@ class struct_binary_struct_traits {
972964
member::bi
973965
>;
974966
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
975-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
976-
static_cast<::apache::thrift::legacy_type_id_t>(15392351242833807340ull)
967+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
977968
>;
978969
};
979970

@@ -1024,8 +1015,7 @@ class dep_A_struct_struct_traits {
10241015
member::i_a
10251016
>;
10261017
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
1027-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
1028-
static_cast<::apache::thrift::legacy_type_id_t>(8602591000426722284ull)
1018+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
10291019
>;
10301020
};
10311021

@@ -1076,8 +1066,7 @@ class dep_B_struct_struct_traits {
10761066
member::i_a
10771067
>;
10781068
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
1079-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
1080-
static_cast<::apache::thrift::legacy_type_id_t>(8784116305731192876ull)
1069+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
10811070
>;
10821071
};
10831072

@@ -1194,8 +1183,7 @@ class annotated_struct_traits {
11941183
member::a
11951184
>;
11961185
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
1197-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
1198-
static_cast<::apache::thrift::legacy_type_id_t>(13050506750255744236ull)
1186+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
11991187
>;
12001188
};
12011189

@@ -1471,8 +1459,7 @@ class struct_with_special_names_struct_traits {
14711459
member::fields
14721460
>;
14731461
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
1474-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
1475-
static_cast<::apache::thrift::legacy_type_id_t>(1059263577269097804ull)
1462+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
14761463
>;
14771464
};
14781465

@@ -1505,8 +1492,7 @@ class StructWithFieldAdapter_struct_traits {
15051492
member::field
15061493
>;
15071494
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
1508-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
1509-
static_cast<::apache::thrift::legacy_type_id_t>(12839341089809937516ull)
1495+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
15101496
>;
15111497
};
15121498

‎third-party/thrift/src/thrift/compiler/test/fixtures/fatal/out/cpp2/gen-cpp2/module_fatal_union.h‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2144,85 +2144,73 @@ class UnionWithTypedefFieldAdapter_variant_traits {
21442144
FATAL_REGISTER_ENUM_TRAITS(
21452145
__fbthrift_refl::union1_tenum_traits,
21462146
::apache::thrift::detail::type_common_metadata_impl<
2147-
::apache::thrift::reflected_annotations<__fbthrift_refl::union1_tenum_traits::annotations>,
2148-
static_cast<::apache::thrift::legacy_type_id_t>(0ull)
2147+
::apache::thrift::reflected_annotations<__fbthrift_refl::union1_tenum_traits::annotations>
21492148
>
21502149
);
21512150
FATAL_REGISTER_VARIANT_TRAITS(
21522151
__fbthrift_refl::union1_variant_traits,
21532152
::apache::thrift::detail::type_common_metadata_impl<
2154-
::apache::thrift::reflected_annotations<__fbthrift_refl::union1_variant_traits::annotations>,
2155-
static_cast<::apache::thrift::legacy_type_id_t>(15193987089687821868ull)
2153+
::apache::thrift::reflected_annotations<__fbthrift_refl::union1_variant_traits::annotations>
21562154
>
21572155
);
21582156
FATAL_REGISTER_ENUM_TRAITS(
21592157
__fbthrift_refl::union2_tenum_traits,
21602158
::apache::thrift::detail::type_common_metadata_impl<
2161-
::apache::thrift::reflected_annotations<__fbthrift_refl::union2_tenum_traits::annotations>,
2162-
static_cast<::apache::thrift::legacy_type_id_t>(0ull)
2159+
::apache::thrift::reflected_annotations<__fbthrift_refl::union2_tenum_traits::annotations>
21632160
>
21642161
);
21652162
FATAL_REGISTER_VARIANT_TRAITS(
21662163
__fbthrift_refl::union2_variant_traits,
21672164
::apache::thrift::detail::type_common_metadata_impl<
2168-
::apache::thrift::reflected_annotations<__fbthrift_refl::union2_variant_traits::annotations>,
2169-
static_cast<::apache::thrift::legacy_type_id_t>(7436399996138825996ull)
2165+
::apache::thrift::reflected_annotations<__fbthrift_refl::union2_variant_traits::annotations>
21702166
>
21712167
);
21722168
FATAL_REGISTER_ENUM_TRAITS(
21732169
__fbthrift_refl::union3_tenum_traits,
21742170
::apache::thrift::detail::type_common_metadata_impl<
2175-
::apache::thrift::reflected_annotations<__fbthrift_refl::union3_tenum_traits::annotations>,
2176-
static_cast<::apache::thrift::legacy_type_id_t>(0ull)
2171+
::apache::thrift::reflected_annotations<__fbthrift_refl::union3_tenum_traits::annotations>
21772172
>
21782173
);
21792174
FATAL_REGISTER_VARIANT_TRAITS(
21802175
__fbthrift_refl::union3_variant_traits,
21812176
::apache::thrift::detail::type_common_metadata_impl<
2182-
::apache::thrift::reflected_annotations<__fbthrift_refl::union3_variant_traits::annotations>,
2183-
static_cast<::apache::thrift::legacy_type_id_t>(12630661616538286124ull)
2177+
::apache::thrift::reflected_annotations<__fbthrift_refl::union3_variant_traits::annotations>
21842178
>
21852179
);
21862180
FATAL_REGISTER_ENUM_TRAITS(
21872181
__fbthrift_refl::unionA_tenum_traits,
21882182
::apache::thrift::detail::type_common_metadata_impl<
2189-
::apache::thrift::reflected_annotations<__fbthrift_refl::unionA_tenum_traits::annotations>,
2190-
static_cast<::apache::thrift::legacy_type_id_t>(0ull)
2183+
::apache::thrift::reflected_annotations<__fbthrift_refl::unionA_tenum_traits::annotations>
21912184
>
21922185
);
21932186
FATAL_REGISTER_VARIANT_TRAITS(
21942187
__fbthrift_refl::unionA_variant_traits,
21952188
::apache::thrift::detail::type_common_metadata_impl<
2196-
::apache::thrift::reflected_annotations<__fbthrift_refl::unionA_variant_traits::annotations>,
2197-
static_cast<::apache::thrift::legacy_type_id_t>(15005039916229430860ull)
2189+
::apache::thrift::reflected_annotations<__fbthrift_refl::unionA_variant_traits::annotations>
21982190
>
21992191
);
22002192
FATAL_REGISTER_ENUM_TRAITS(
22012193
__fbthrift_refl::union_with_special_names_tenum_traits,
22022194
::apache::thrift::detail::type_common_metadata_impl<
2203-
::apache::thrift::reflected_annotations<__fbthrift_refl::union_with_special_names_tenum_traits::annotations>,
2204-
static_cast<::apache::thrift::legacy_type_id_t>(0ull)
2195+
::apache::thrift::reflected_annotations<__fbthrift_refl::union_with_special_names_tenum_traits::annotations>
22052196
>
22062197
);
22072198
FATAL_REGISTER_VARIANT_TRAITS(
22082199
__fbthrift_refl::union_with_special_names_variant_traits,
22092200
::apache::thrift::detail::type_common_metadata_impl<
2210-
::apache::thrift::reflected_annotations<__fbthrift_refl::union_with_special_names_variant_traits::annotations>,
2211-
static_cast<::apache::thrift::legacy_type_id_t>(13162369197726992076ull)
2201+
::apache::thrift::reflected_annotations<__fbthrift_refl::union_with_special_names_variant_traits::annotations>
22122202
>
22132203
);
22142204
FATAL_REGISTER_ENUM_TRAITS(
22152205
__fbthrift_refl::UnionWithTypedefFieldAdapter_tenum_traits,
22162206
::apache::thrift::detail::type_common_metadata_impl<
2217-
::apache::thrift::reflected_annotations<__fbthrift_refl::UnionWithTypedefFieldAdapter_tenum_traits::annotations>,
2218-
static_cast<::apache::thrift::legacy_type_id_t>(0ull)
2207+
::apache::thrift::reflected_annotations<__fbthrift_refl::UnionWithTypedefFieldAdapter_tenum_traits::annotations>
22192208
>
22202209
);
22212210
FATAL_REGISTER_VARIANT_TRAITS(
22222211
__fbthrift_refl::UnionWithTypedefFieldAdapter_variant_traits,
22232212
::apache::thrift::detail::type_common_metadata_impl<
2224-
::apache::thrift::reflected_annotations<__fbthrift_refl::UnionWithTypedefFieldAdapter_variant_traits::annotations>,
2225-
static_cast<::apache::thrift::legacy_type_id_t>(10841541077214060908ull)
2213+
::apache::thrift::reflected_annotations<__fbthrift_refl::UnionWithTypedefFieldAdapter_variant_traits::annotations>
22262214
>
22272215
);
22282216
} // namespace test_cpp2::cpp_reflection

‎third-party/thrift/src/thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2_enums/gen-cpp2/enums_fatal_struct.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ class SomeStruct_struct_traits {
4848
member::fieldA
4949
>;
5050
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
51-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
52-
static_cast<::apache::thrift::legacy_type_id_t>(10691278903523363788ull)
51+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
5352
>;
5453
};
5554

‎third-party/thrift/src/thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2_extra_services/gen-cpp2/extra_services_fatal_struct.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ class containerStruct2_struct_traits {
157157
member::opt_fieldE
158158
>;
159159
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
160-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
161-
static_cast<::apache::thrift::legacy_type_id_t>(6698051510995854220ull)
160+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
162161
>;
163162
};
164163

‎third-party/thrift/src/thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2_reflection/gen-cpp2/reflection_fatal_struct.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ class ReflectionStruct_struct_traits {
4848
member::fieldA
4949
>;
5050
using metadata = ::apache::thrift::detail::type_common_metadata_impl<
51-
::apache::thrift::reflected_annotations<__fbthrift_annotations>,
52-
static_cast<::apache::thrift::legacy_type_id_t>(16334935087599571500ull)
51+
::apache::thrift::reflected_annotations<__fbthrift_annotations>
5352
>;
5453
};
5554

0 commit comments

Comments
 (0)