Skip to content

Commit 7964eae

Browse files
John Tranfacebook-github-bot
authored andcommitted
Revert D79417779: Add new hack annotations for thrift compiler
Differential Revision: D79417779 Original commit changeset: 30cc99340289 Original Phabricator Diff: D79417779 fbshipit-source-id: 3bf81add88f17de0aab896eae6517baf7874c444
1 parent a026a10 commit 7964eae

File tree

67 files changed

+10
-9522
lines changed

Some content is hidden

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

67 files changed

+10
-9522
lines changed

third-party/thrift/src/thrift/annotation/hack.thrift

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,3 @@ struct ModuleInternal {}
210210
@scope.Service
211211
@scope.Function
212212
struct GenerateClientMethodsWithHeaders {}
213-
214-
/**
215-
* Generated Hack types are being changed to `final` by default.
216-
*
217-
* For existing thrift types that are inherited from and cannot be easily migrated,
218-
* use this annotation to make the generated class non-final.
219-
*/
220-
@scope.Structured
221-
struct MigrationBlockingAllowInheritance {}
222-
223-
/**
224-
* Hack Unions without the `protected` compiler option may rely on `fb_json_serialize` for JSON serialization.
225-
* Adding this annotation will implement the JSONSerializable Hack interface allowing `fb_json_serialize` to continue being used.
226-
*
227-
* Note: This should only be used for migration purposes. Use `JSONThriftSerializer` instead.
228-
*/
229-
@scope.Union
230-
struct MigrationBlockingLegacyJSONSerialization {}

third-party/thrift/src/thrift/compiler/ast/uri.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,6 @@ inline constexpr auto kHackModuleInternalUri =
186186
"facebook.com/thrift/annotation/hack/ModuleInternal";
187187
inline constexpr auto kHackGenerateClientMethodsWithHeaders =
188188
"facebook.com/thrift/annotation/hack/GenerateClientMethodsWithHeaders";
189-
inline constexpr auto kHackMigrationBlockingAllowInheritance =
190-
"facebook.com/thrift/annotation/hack/MigrationBlockingAllowInheritance";
191-
inline constexpr auto kHackMigrationBlockingLegacyJSONSerialization =
192-
"facebook.com/thrift/annotation/hack/MigrationBlockingLegacyJSONSerialization";
193189

194190
// Go:
195191
inline constexpr auto kGoNameUri = "facebook.com/thrift/annotation/go/Name";

third-party/thrift/src/thrift/compiler/test/fixtures/adapter/out/android/gen-android/com/facebook/thrift/annotation/hack_deprecated/MigrationBlockingAllowInheritance.java

Lines changed: 0 additions & 122 deletions
This file was deleted.

third-party/thrift/src/thrift/compiler/test/fixtures/adapter/out/android/gen-android/com/facebook/thrift/annotation/hack_deprecated/MigrationBlockingLegacyJSONSerialization.java

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)