Remove cpp.enum_type support

Summary: Fully migrated to structured annotation

Reviewed By: hchokshi

Differential Revision: D69412826

fbshipit-source-id: d50b2b14e8dedced1e3695f24e02d6050bab636e

Author: iahs

third-party/thrift/src/thrift/compiler/codemod/structure_annotations.cc

@@ -232,37 +232,6 @@ class structure_annotations {
         to_add.insert("@cpp.MinimizePadding");
         fm_.add_include("thrift/annotation/cpp.thrift");
       }
-    } else if (name == "cpp.enum_type") {
-      to_remove.emplace_back(name, data);
-      if (!node.has_structured_annotation(kCppEnumTypeUri)) {
-        std::string_view value = data.value;
-        if (value.substr(0, 2) == "::") {
-          value = value.substr(2);
-        }
-        if (value.substr(0, 5) == "std::") {
-          value = value.substr(5);
-        }
-        std::string type;
-        if (value == "int8_t" || value == "char") {
-          type = "I8";
-        } else if (value == "uint8_t" || value == "unsigned char") {
-          type = "U8";
-        } else if (value == "int16_t" || value == "short") {
-          type = "I16";
-        } else if (value == "uint16_t" || value == "unsigned short") {
-          type = "U16";
-        } else if (
-            value == "uint32_t" || value == "unsigned long" ||
-            value == "unsigned" || value == "uint") {
-          type = "U32";
-        } else {
-          return;
-        }
-        to_add.insert(
-            fmt::format(
-                "@cpp.EnumType{{type = cpp.EnumUnderlyingType.{}}}", type));
-        fm_.add_include("thrift/annotation/cpp.thrift");
-      }
     } else if (
         name == "cpp.declare_bitwise_ops" &&
         (node.has_structured_annotation(kBitmaskEnumUri) ||

third-party/thrift/src/thrift/compiler/codemod/structure_annotations_test.py

@@ -154,13 +154,6 @@ def test_cpp(self):
                 } (message="m", cpp.minimize_padding)
                 exception EE {}
 
-                enum E8 {} (cpp.enum_type="char")
-                enum E16 {} (cpp.enum_type="int16_t")
-                enum E32 {} (cpp.enum_type="int")
-                enum U8 {} (cpp.enum_type="std::uint8_t")
-                enum U16 {} (cpp.enum_type="unsigned short")
-                enum U32 {} (cpp.enum_type="::std::uint32_t", cpp.declare_bitwise_ops)
-
                 interaction J {} (serial)
                 service S {
                     void f() (thread = "eb", priority = "HIGH")
@@ -215,19 +208,6 @@ def test_cpp(self):
                 }
                 exception EE {}
 
-                @cpp.EnumType{type = cpp.EnumUnderlyingType.I8}
-                enum E8 {}
-                @cpp.EnumType{type = cpp.EnumUnderlyingType.I16}
-                enum E16 {}
-                enum E32 {}
-                @cpp.EnumType{type = cpp.EnumUnderlyingType.U8}
-                enum U8 {}
-                @cpp.EnumType{type = cpp.EnumUnderlyingType.U16}
-                enum U16 {}
-                @cpp.EnumType{type = cpp.EnumUnderlyingType.U32}
-                @thrift.DeprecatedUnvalidatedAnnotations{items = {"cpp.declare_bitwise_ops": "1"}}
-                enum U32 {}
-
                 @thrift.Serial
                 interaction J {}
                 service S {

third-party/thrift/src/thrift/compiler/generate/t_mstch_cpp2_generator.cc

@@ -692,10 +692,6 @@ class t_mstch_cpp2_generator : public t_mstch_generator {
             throw std::runtime_error("unknown enum underlying type");
         }
       }
-      if (const std::string* type =
-              e.find_unstructured_annotation_or_null("cpp.enum_type")) {
-        return *type;
-      }
       return e.has_unstructured_annotation("cpp.deprecated_enum_unscoped")
           ? "int"
           : "";

third-party/thrift/src/thrift/compiler/sema/standard_validator.cc

@@ -1753,6 +1753,7 @@ void deprecate_annotations(sema_context& ctx, const t_named& node) {
       "code",
       "cpp.indirection",
       "cpp2.declare_bitwise_ops",
+      "cpp.enum_type",
       "cpp2.enum_type",
       "cpp2.deprecated_enum_unscoped",
       "process_in_event_base",