Skip to content

Commit 6d66081

Browse files
Mizuchimeta-codesync[bot]
Mizuchi
authored and
meta-codesync[bot]
committed
Revert D85978392: Generate structured annotations in metadata.thrift from schema.thrift for Enum
Differential Revision: D85978392 Original commit changeset: 1d4d55e7fde5 Original Phabricator Diff: D85978392 fbshipit-source-id: ac7254a1d7e347b9d570fd27d0ca7c3ce1071242
1 parent be57df7 commit 6d66081

File tree

88 files changed

+70
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+70
-388
lines changed

‎third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_metadata.cpp.mustache‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
{{> Autogen}}
2020
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
2121
#include "{{program:include_prefix}}{{program:name}}_metadata.h"
22-
#include "{{program:include_prefix}}{{program:name}}_data.h"
2322

2423
// some of these functions can be so large that the compiler gives up optimizing
2524
// them - and issues a warning which may be treated as an error!
@@ -44,7 +43,7 @@ using ThriftFunctionGenerator = void (*)(ThriftMetadata&, ThriftService&);
4443
4544
{{#program:enums}}
4645
void EnumMetadata<::{{program:qualified_namespace}}::{{enum:cpp_name}}>::gen(ThriftMetadata& metadata) {
47-
auto res = genEnumMetadata<::{{program:qualified_namespace}}::{{enum:cpp_name}}>(metadata, false);
46+
auto res = genEnumMetadata<::{{program:qualified_namespace}}::{{enum:cpp_name}}>(metadata);
4847
if (res.preExists) {
4948
return;
5049
}

‎third-party/thrift/src/thrift/compiler/test/fixtures/adapter/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/adapter/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/adapter/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!
@@ -37,13 +36,13 @@ using ThriftServiceContext = ::apache::thrift::metadata::ThriftServiceContext;
3736
using ThriftFunctionGenerator = void (*)(ThriftMetadata&, ThriftService&);
3837

3938
void EnumMetadata<::facebook::thrift::test::Color>::gen(ThriftMetadata& metadata) {
40-
auto res = genEnumMetadata<::facebook::thrift::test::Color>(metadata, false);
39+
auto res = genEnumMetadata<::facebook::thrift::test::Color>(metadata);
4140
if (res.preExists) {
4241
return;
4342
}
4443
}
4544
void EnumMetadata<::facebook::thrift::test::ThriftAdaptedEnum>::gen(ThriftMetadata& metadata) {
46-
auto res = genEnumMetadata<::facebook::thrift::test::ThriftAdaptedEnum>(metadata, false);
45+
auto res = genEnumMetadata<::facebook::thrift::test::ThriftAdaptedEnum>(metadata);
4746
if (res.preExists) {
4847
return;
4948
}

‎third-party/thrift/src/thrift/compiler/test/fixtures/adapter/out/cpp2_no_uri/gen-cpp2/module_no_uri_metadata.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/adapter/gen-cpp2/module_no_uri_metadata.h"
9-
#include "thrift/compiler/test/fixtures/adapter/gen-cpp2/module_no_uri_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!

‎third-party/thrift/src/thrift/compiler/test/fixtures/aliasing/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/aliasing/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/aliasing/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!

‎third-party/thrift/src/thrift/compiler/test/fixtures/any/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/any/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/any/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!

‎third-party/thrift/src/thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/basic-annotations/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/basic-annotations/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!
@@ -52,7 +51,7 @@ using ThriftServiceContext = ::apache::thrift::metadata::ThriftServiceContext;
5251
using ThriftFunctionGenerator = void (*)(ThriftMetadata&, ThriftService&);
5352

5453
void EnumMetadata<::cpp2::YourEnum>::gen(ThriftMetadata& metadata) {
55-
auto res = genEnumMetadata<::cpp2::YourEnum>(metadata, false);
54+
auto res = genEnumMetadata<::cpp2::YourEnum>(metadata);
5655
if (res.preExists) {
5756
return;
5857
}

‎third-party/thrift/src/thrift/compiler/test/fixtures/basic-enum/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/basic-enum/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/basic-enum/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!
@@ -27,26 +26,26 @@ using ThriftServiceContext = ::apache::thrift::metadata::ThriftServiceContext;
2726
using ThriftFunctionGenerator = void (*)(ThriftMetadata&, ThriftService&);
2827

2928
void EnumMetadata<::test::fixtures::enumstrict::EmptyEnum>::gen(ThriftMetadata& metadata) {
30-
auto res = genEnumMetadata<::test::fixtures::enumstrict::EmptyEnum>(metadata, false);
29+
auto res = genEnumMetadata<::test::fixtures::enumstrict::EmptyEnum>(metadata);
3130
if (res.preExists) {
3231
return;
3332
}
3433
}
3534
void EnumMetadata<::test::fixtures::enumstrict::MyEnum>::gen(ThriftMetadata& metadata) {
36-
auto res = genEnumMetadata<::test::fixtures::enumstrict::MyEnum>(metadata, false);
35+
auto res = genEnumMetadata<::test::fixtures::enumstrict::MyEnum>(metadata);
3736
if (res.preExists) {
3837
return;
3938
}
4039
}
4140
void EnumMetadata<::test::fixtures::enumstrict::MyUseIntrinsicDefaultEnum>::gen(ThriftMetadata& metadata) {
42-
auto res = genEnumMetadata<::test::fixtures::enumstrict::MyUseIntrinsicDefaultEnum>(metadata, false);
41+
auto res = genEnumMetadata<::test::fixtures::enumstrict::MyUseIntrinsicDefaultEnum>(metadata);
4342
if (res.preExists) {
4443
return;
4544
}
4645
res.metadata.structured_annotations()->push_back(*cvStruct("java.UseIntrinsicDefault", { }).cv_struct());
4746
}
4847
void EnumMetadata<::test::fixtures::enumstrict::MyBigEnum>::gen(ThriftMetadata& metadata) {
49-
auto res = genEnumMetadata<::test::fixtures::enumstrict::MyBigEnum>(metadata, false);
48+
auto res = genEnumMetadata<::test::fixtures::enumstrict::MyBigEnum>(metadata);
5049
if (res.preExists) {
5150
return;
5251
}

‎third-party/thrift/src/thrift/compiler/test/fixtures/basic-stack-arguments/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/basic-stack-arguments/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/basic-stack-arguments/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!
@@ -42,7 +41,7 @@ using ThriftServiceContext = ::apache::thrift::metadata::ThriftServiceContext;
4241
using ThriftFunctionGenerator = void (*)(ThriftMetadata&, ThriftService&);
4342

4443
void EnumMetadata<::cpp2::MyEnum>::gen(ThriftMetadata& metadata) {
45-
auto res = genEnumMetadata<::cpp2::MyEnum>(metadata, false);
44+
auto res = genEnumMetadata<::cpp2::MyEnum>(metadata);
4645
if (res.preExists) {
4746
return;
4847
}

‎third-party/thrift/src/thrift/compiler/test/fixtures/basic-structured-annotations/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/basic-structured-annotations/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/basic-structured-annotations/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!
@@ -32,7 +31,7 @@ using ThriftServiceContext = ::apache::thrift::metadata::ThriftServiceContext;
3231
using ThriftFunctionGenerator = void (*)(ThriftMetadata&, ThriftService&);
3332

3433
void EnumMetadata<::test::fixtures::basic_structured_annotations::MyEnum>::gen(ThriftMetadata& metadata) {
35-
auto res = genEnumMetadata<::test::fixtures::basic_structured_annotations::MyEnum>(metadata, false);
34+
auto res = genEnumMetadata<::test::fixtures::basic_structured_annotations::MyEnum>(metadata);
3635
if (res.preExists) {
3736
return;
3837
}

‎third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/module_metadata.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
#include <thrift/lib/cpp2/gen/module_metadata_cpp.h>
88
#include "thrift/compiler/test/fixtures/basic/gen-cpp2/module_metadata.h"
9-
#include "thrift/compiler/test/fixtures/basic/gen-cpp2/module_data.h"
109

1110
// some of these functions can be so large that the compiler gives up optimizing
1211
// them - and issues a warning which may be treated as an error!
@@ -47,13 +46,13 @@ using ThriftServiceContext = ::apache::thrift::metadata::ThriftServiceContext;
4746
using ThriftFunctionGenerator = void (*)(ThriftMetadata&, ThriftService&);
4847

4948
void EnumMetadata<::test::fixtures::basic::MyEnum>::gen(ThriftMetadata& metadata) {
50-
auto res = genEnumMetadata<::test::fixtures::basic::MyEnum>(metadata, false);
49+
auto res = genEnumMetadata<::test::fixtures::basic::MyEnum>(metadata);
5150
if (res.preExists) {
5251
return;
5352
}
5453
}
5554
void EnumMetadata<::test::fixtures::basic::HackEnum>::gen(ThriftMetadata& metadata) {
56-
auto res = genEnumMetadata<::test::fixtures::basic::HackEnum>(metadata, false);
55+
auto res = genEnumMetadata<::test::fixtures::basic::HackEnum>(metadata);
5756
if (res.preExists) {
5857
return;
5958
}

0 commit comments

Comments
 (0)