Skip to content

Commit b2ebe59

Browse files
mszabo-wikiamszabo-wikia
committed
Temporarily revert fbthrift breakage
This reverts commit 2b1c18b.
1 parent 7106aaa commit b2ebe59

File tree

21 files changed

+51
-5187
lines changed

21 files changed

+51
-5187
lines changed

‎third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_types_h/union_field_ref.mustache

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,4 @@
3838
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> {{field:cpp_name}}_ref() && {
3939
return {std::move(value_.{{field:cpp_name}}), fbthrift_type_, folly::to_underlying(Type::{{field:cpp_name}}), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
4040
}
41-
42-
{{> common/field_docblock}}
43-
template <typename..., typename T = {{field:cpp_storage_type}}>
44-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> {{field:cpp_name}}() const& {
45-
return {value_.{{field:cpp_name}}, fbthrift_type_, folly::to_underlying(Type::{{field:cpp_name}}), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
46-
}
47-
48-
{{> common/field_docblock}}
49-
template <typename..., typename T = {{field:cpp_storage_type}}>
50-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> {{field:cpp_name}}() const&& {
51-
return {std::move(value_.{{field:cpp_name}}), fbthrift_type_, folly::to_underlying(Type::{{field:cpp_name}}), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
52-
}
53-
54-
{{> common/field_docblock}}
55-
template <typename..., typename T = {{field:cpp_storage_type}}>
56-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> {{field:cpp_name}}() & {
57-
return {value_.{{field:cpp_name}}, fbthrift_type_, folly::to_underlying(Type::{{field:cpp_name}}), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
58-
}
59-
60-
{{> common/field_docblock}}
61-
template <typename..., typename T = {{field:cpp_storage_type}}>
62-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> {{field:cpp_name}}() && {
63-
return {std::move(value_.{{field:cpp_name}}), fbthrift_type_, folly::to_underlying(Type::{{field:cpp_name}}), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
64-
}
6541
{{/field:type}}{{/struct:fields}}

‎third-party/thrift/src/thrift/compiler/test/fixtures/adapter/out/cpp2/gen-cpp2/module_types.h

Lines changed: 0 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,30 +1826,6 @@ class Baz final {
18261826
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> intField_ref() && {
18271827
return {std::move(value_.intField), fbthrift_type_, folly::to_underlying(Type::intField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
18281828
}
1829-
1830-
/** Glean { "field": "intField" } */
1831-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::facebook::thrift::test::i32_5137, Baz>>
1832-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> intField() const& {
1833-
return {value_.intField, fbthrift_type_, folly::to_underlying(Type::intField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1834-
}
1835-
1836-
/** Glean { "field": "intField" } */
1837-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::facebook::thrift::test::i32_5137, Baz>>
1838-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> intField() const&& {
1839-
return {std::move(value_.intField), fbthrift_type_, folly::to_underlying(Type::intField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1840-
}
1841-
1842-
/** Glean { "field": "intField" } */
1843-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::facebook::thrift::test::i32_5137, Baz>>
1844-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> intField() & {
1845-
return {value_.intField, fbthrift_type_, folly::to_underlying(Type::intField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1846-
}
1847-
1848-
/** Glean { "field": "intField" } */
1849-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::facebook::thrift::test::i32_5137, Baz>>
1850-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> intField() && {
1851-
return {std::move(value_.intField), fbthrift_type_, folly::to_underlying(Type::intField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1852-
}
18531829
/** Glean { "field": "setField" } */
18541830
template <typename..., typename T = ::facebook::thrift::test::SetWithAdapter>
18551831
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> setField_ref() const& {
@@ -1873,30 +1849,6 @@ class Baz final {
18731849
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> setField_ref() && {
18741850
return {std::move(value_.setField), fbthrift_type_, folly::to_underlying(Type::setField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
18751851
}
1876-
1877-
/** Glean { "field": "setField" } */
1878-
template <typename..., typename T = ::facebook::thrift::test::SetWithAdapter>
1879-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> setField() const& {
1880-
return {value_.setField, fbthrift_type_, folly::to_underlying(Type::setField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1881-
}
1882-
1883-
/** Glean { "field": "setField" } */
1884-
template <typename..., typename T = ::facebook::thrift::test::SetWithAdapter>
1885-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> setField() const&& {
1886-
return {std::move(value_.setField), fbthrift_type_, folly::to_underlying(Type::setField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1887-
}
1888-
1889-
/** Glean { "field": "setField" } */
1890-
template <typename..., typename T = ::facebook::thrift::test::SetWithAdapter>
1891-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> setField() & {
1892-
return {value_.setField, fbthrift_type_, folly::to_underlying(Type::setField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1893-
}
1894-
1895-
/** Glean { "field": "setField" } */
1896-
template <typename..., typename T = ::facebook::thrift::test::SetWithAdapter>
1897-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> setField() && {
1898-
return {std::move(value_.setField), fbthrift_type_, folly::to_underlying(Type::setField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1899-
}
19001852
/** Glean { "field": "mapField" } */
19011853
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter3, 6, ::facebook::thrift::test::map_string_ListWithElemAdapter_withAdapter_8454, Baz>>
19021854
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> mapField_ref() const& {
@@ -1920,30 +1872,6 @@ class Baz final {
19201872
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> mapField_ref() && {
19211873
return {std::move(value_.mapField), fbthrift_type_, folly::to_underlying(Type::mapField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
19221874
}
1923-
1924-
/** Glean { "field": "mapField" } */
1925-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter3, 6, ::facebook::thrift::test::map_string_ListWithElemAdapter_withAdapter_8454, Baz>>
1926-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> mapField() const& {
1927-
return {value_.mapField, fbthrift_type_, folly::to_underlying(Type::mapField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1928-
}
1929-
1930-
/** Glean { "field": "mapField" } */
1931-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter3, 6, ::facebook::thrift::test::map_string_ListWithElemAdapter_withAdapter_8454, Baz>>
1932-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> mapField() const&& {
1933-
return {std::move(value_.mapField), fbthrift_type_, folly::to_underlying(Type::mapField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1934-
}
1935-
1936-
/** Glean { "field": "mapField" } */
1937-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter3, 6, ::facebook::thrift::test::map_string_ListWithElemAdapter_withAdapter_8454, Baz>>
1938-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> mapField() & {
1939-
return {value_.mapField, fbthrift_type_, folly::to_underlying(Type::mapField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1940-
}
1941-
1942-
/** Glean { "field": "mapField" } */
1943-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter3, 6, ::facebook::thrift::test::map_string_ListWithElemAdapter_withAdapter_8454, Baz>>
1944-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> mapField() && {
1945-
return {std::move(value_.mapField), fbthrift_type_, folly::to_underlying(Type::mapField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1946-
}
19471875
/** Glean { "field": "binaryField" } */
19481876
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 8, ::facebook::thrift::test::binary_5673, Baz>>
19491877
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> binaryField_ref() const& {
@@ -1967,30 +1895,6 @@ class Baz final {
19671895
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> binaryField_ref() && {
19681896
return {std::move(value_.binaryField), fbthrift_type_, folly::to_underlying(Type::binaryField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
19691897
}
1970-
1971-
/** Glean { "field": "binaryField" } */
1972-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 8, ::facebook::thrift::test::binary_5673, Baz>>
1973-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> binaryField() const& {
1974-
return {value_.binaryField, fbthrift_type_, folly::to_underlying(Type::binaryField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1975-
}
1976-
1977-
/** Glean { "field": "binaryField" } */
1978-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 8, ::facebook::thrift::test::binary_5673, Baz>>
1979-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> binaryField() const&& {
1980-
return {std::move(value_.binaryField), fbthrift_type_, folly::to_underlying(Type::binaryField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1981-
}
1982-
1983-
/** Glean { "field": "binaryField" } */
1984-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 8, ::facebook::thrift::test::binary_5673, Baz>>
1985-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> binaryField() & {
1986-
return {value_.binaryField, fbthrift_type_, folly::to_underlying(Type::binaryField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1987-
}
1988-
1989-
/** Glean { "field": "binaryField" } */
1990-
template <typename..., typename T = ::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 8, ::facebook::thrift::test::binary_5673, Baz>>
1991-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> binaryField() && {
1992-
return {std::move(value_.binaryField), fbthrift_type_, folly::to_underlying(Type::binaryField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
1993-
}
19941898
/** Glean { "field": "longField" } */
19951899
template <typename..., typename T = ::facebook::thrift::test::MyI64>
19961900
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> longField_ref() const& {
@@ -2014,30 +1918,6 @@ class Baz final {
20141918
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> longField_ref() && {
20151919
return {std::move(value_.longField), fbthrift_type_, folly::to_underlying(Type::longField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
20161920
}
2017-
2018-
/** Glean { "field": "longField" } */
2019-
template <typename..., typename T = ::facebook::thrift::test::MyI64>
2020-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> longField() const& {
2021-
return {value_.longField, fbthrift_type_, folly::to_underlying(Type::longField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
2022-
}
2023-
2024-
/** Glean { "field": "longField" } */
2025-
template <typename..., typename T = ::facebook::thrift::test::MyI64>
2026-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> longField() const&& {
2027-
return {std::move(value_.longField), fbthrift_type_, folly::to_underlying(Type::longField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
2028-
}
2029-
2030-
/** Glean { "field": "longField" } */
2031-
template <typename..., typename T = ::facebook::thrift::test::MyI64>
2032-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> longField() & {
2033-
return {value_.longField, fbthrift_type_, folly::to_underlying(Type::longField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
2034-
}
2035-
2036-
/** Glean { "field": "longField" } */
2037-
template <typename..., typename T = ::facebook::thrift::test::MyI64>
2038-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> longField() && {
2039-
return {std::move(value_.longField), fbthrift_type_, folly::to_underlying(Type::longField), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
2040-
}
20411921
Type getType() const { return static_cast<Type>(fbthrift_type_); }
20421922

20431923
template <class Protocol_>
@@ -6115,30 +5995,6 @@ class ThriftAdaptTestUnion final {
61155995
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> delay_ref() && {
61165996
return {std::move(value_.delay), fbthrift_type_, folly::to_underlying(Type::delay), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
61175997
}
6118-
6119-
/** Glean { "field": "delay" } */
6120-
template <typename..., typename T = ::facebook::thrift::test::DurationMs>
6121-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> delay() const& {
6122-
return {value_.delay, fbthrift_type_, folly::to_underlying(Type::delay), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6123-
}
6124-
6125-
/** Glean { "field": "delay" } */
6126-
template <typename..., typename T = ::facebook::thrift::test::DurationMs>
6127-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> delay() const&& {
6128-
return {std::move(value_.delay), fbthrift_type_, folly::to_underlying(Type::delay), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6129-
}
6130-
6131-
/** Glean { "field": "delay" } */
6132-
template <typename..., typename T = ::facebook::thrift::test::DurationMs>
6133-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> delay() & {
6134-
return {value_.delay, fbthrift_type_, folly::to_underlying(Type::delay), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6135-
}
6136-
6137-
/** Glean { "field": "delay" } */
6138-
template <typename..., typename T = ::facebook::thrift::test::DurationMs>
6139-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> delay() && {
6140-
return {std::move(value_.delay), fbthrift_type_, folly::to_underlying(Type::delay), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6141-
}
61425998
/** Glean { "field": "custom" } */
61435999
template <typename..., typename T = ::facebook::thrift::test::CustomProtocolType>
61446000
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> custom_ref() const& {
@@ -6162,30 +6018,6 @@ class ThriftAdaptTestUnion final {
61626018
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> custom_ref() && {
61636019
return {std::move(value_.custom), fbthrift_type_, folly::to_underlying(Type::custom), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
61646020
}
6165-
6166-
/** Glean { "field": "custom" } */
6167-
template <typename..., typename T = ::facebook::thrift::test::CustomProtocolType>
6168-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> custom() const& {
6169-
return {value_.custom, fbthrift_type_, folly::to_underlying(Type::custom), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6170-
}
6171-
6172-
/** Glean { "field": "custom" } */
6173-
template <typename..., typename T = ::facebook::thrift::test::CustomProtocolType>
6174-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> custom() const&& {
6175-
return {std::move(value_.custom), fbthrift_type_, folly::to_underlying(Type::custom), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6176-
}
6177-
6178-
/** Glean { "field": "custom" } */
6179-
template <typename..., typename T = ::facebook::thrift::test::CustomProtocolType>
6180-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> custom() & {
6181-
return {value_.custom, fbthrift_type_, folly::to_underlying(Type::custom), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6182-
}
6183-
6184-
/** Glean { "field": "custom" } */
6185-
template <typename..., typename T = ::facebook::thrift::test::CustomProtocolType>
6186-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> custom() && {
6187-
return {std::move(value_.custom), fbthrift_type_, folly::to_underlying(Type::custom), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
6188-
}
61896021
Type getType() const { return static_cast<Type>(fbthrift_type_); }
61906022

61916023
template <class Protocol_>

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -232,30 +232,6 @@ class RefUnion final {
232232
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> field1_ref() && {
233233
return {std::move(value_.field1), fbthrift_type_, folly::to_underlying(Type::field1), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
234234
}
235-
236-
/** Glean { "field": "field1" } */
237-
template <typename..., typename T = ::std::shared_ptr<::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::std::string, RefUnion>>>
238-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&> field1() const& {
239-
return {value_.field1, fbthrift_type_, folly::to_underlying(Type::field1), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
240-
}
241-
242-
/** Glean { "field": "field1" } */
243-
template <typename..., typename T = ::std::shared_ptr<::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::std::string, RefUnion>>>
244-
FOLLY_ERASE ::apache::thrift::union_field_ref<const T&&> field1() const&& {
245-
return {std::move(value_.field1), fbthrift_type_, folly::to_underlying(Type::field1), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
246-
}
247-
248-
/** Glean { "field": "field1" } */
249-
template <typename..., typename T = ::std::shared_ptr<::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::std::string, RefUnion>>>
250-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&> field1() & {
251-
return {value_.field1, fbthrift_type_, folly::to_underlying(Type::field1), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
252-
}
253-
254-
/** Glean { "field": "field1" } */
255-
template <typename..., typename T = ::std::shared_ptr<::apache::thrift::adapt_detail::adapted_field_t<::my::Adapter1, 1, ::std::string, RefUnion>>>
256-
FOLLY_ERASE ::apache::thrift::union_field_ref<T&&> field1() && {
257-
return {std::move(value_.field1), fbthrift_type_, folly::to_underlying(Type::field1), this, ::apache::thrift::detail::union_field_ref_owner_vtable_for<decltype(*this)>};
258-
}
259235
Type getType() const { return static_cast<Type>(fbthrift_type_); }
260236

261237
template <class Protocol_>

0 commit comments

Comments
 (0)