Report an error for cpp2.deprecated_enum_unscoped

Summary: Report an error for `cpp2.deprecated_enum_unscoped` support for which we recently removed.

Reviewed By: iahs

Differential Revision: D71487259

fbshipit-source-id: 783dbcbb3e8ada99c95103f92db1e1dfb39cae02

Author: vitaut

thrift/compiler/sema/standard_validator.cc

@@ -1429,7 +1429,8 @@ void deprecate_annotations(sema_context& ctx, const t_named& node) {
       {"erl.default_value", erlang("DefaultValue")},
       {"iq.node_type", erlang("Iq")},
   };
-  std::set<std::string> removed_annotations = {"cpp2.declare_bitwise_ops"};
+  std::set<std::string> removed_annotations = {
+      "cpp2.declare_bitwise_ops", "cpp2.deprecated_enum_unscoped"};
   std::map<std::string, std::string> removed_prefixes = {{"rust.", "rust"}};
 
   for (const auto& [k, v] : node.annotations()) {
@@ -1448,6 +1449,10 @@ void deprecate_annotations(sema_context& ctx, const t_named& node) {
     }
     bool directly_deprecated = deprecations.count(k) != 0;
     if (!prefix && !directly_deprecated) {
+      if (removed_annotations.count(k) != 0) {
+        ctx.error("invalid annotation {}", k);
+        continue;
+      }
       continue;
     }
     std::string replacement;

thrift/compiler/test/compiler_test.cc

@@ -786,19 +786,22 @@ TEST(CompilerTest, removed_annotations) {
   check_compile(R"(
     include "thrift/annotation/thrift.thrift"
 
-    enum E {} (cpp2.declare_bitwise_ops)
+    enum E1 {} (cpp2.declare_bitwise_ops)
     # expected-error@-1: The annotation cpp2.declare_bitwise_ops has been removed. Please use @thrift.BitmaskEnum instead.
 
     @thrift.DeprecatedUnvalidatedAnnotations{items = {"cpp2.declare_bitwise_ops": "1"}}
-    enum F {}
+    enum E2 {}
     # expected-error@-2: The annotation cpp2.declare_bitwise_ops has been removed. Please use @thrift.BitmaskEnum instead.
 
+    enum E3 {} (cpp2.deprecated_enum_unscoped)
+    # expected-error@-1: invalid annotation cpp2.deprecated_enum_unscoped
+
     struct A {
-        1: i64 removed_unstructured (rust.foo) 
-        # expected-error@-1: The annotation rust.foo has been removed. Please use a structured annotation from thrift/annotation/rust.thrift instead.
-        @thrift.DeprecatedUnvalidatedAnnotations{items = {"rust.foo": "1"}}
-        2: i64 removed_catchall 
-        # expected-error@-2: The annotation rust.foo has been removed. Please use a structured annotation from thrift/annotation/rust.thrift instead.
+      1: i64 removed_unstructured (rust.foo)
+      # expected-error@-1: The annotation rust.foo has been removed. Please use a structured annotation from thrift/annotation/rust.thrift instead.
+      @thrift.DeprecatedUnvalidatedAnnotations{items = {"rust.foo": "1"}}
+      2: i64 removed_catchall
+      # expected-error@-2: The annotation rust.foo has been removed. Please use a structured annotation from thrift/annotation/rust.thrift instead.
     }
 
     typedef map<string, string> (rust.type = "HashMap") HashMap
@@ -808,7 +811,7 @@ TEST(CompilerTest, removed_annotations) {
     typedef S T
 
     service J {
-        i64 foo(1: i64 arg (rust.name = "bar")) # expected-error: The annotation rust.name has been removed. Please use a structured annotation from thrift/annotation/rust.thrift instead.
+      i64 foo(1: i64 arg (rust.name = "bar")) # expected-error: The annotation rust.name has been removed. Please use a structured annotation from thrift/annotation/rust.thrift instead.
     }
   )");
 }