Revert D87118568: Add cpp.NonOrderable annotation to delete operator<

Differential Revision:
D87118568

Original commit changeset: 9c9c083a5b6a

Original Phabricator Diff: D87118568

fbshipit-source-id: d1d0f1d871f3e0197cd22e809b3c80e6078a80a0

Author: Thomas Polasek

thrift/annotation/cpp.thrift

@@ -413,7 +413,7 @@ struct AllowLegacyDeprecatedTerseWritesRef {}
 /**
  * If there are custom types in thrift structure (e.g., `std::unordered_map` field),
  * We won't define `operator<` automatically (unless URI exists, but that's about
- * to change). Note that `operator<` is always declared, unless `@cpp.NonOrderable` is used.
+ * to change). Note that `operator<` is always declared.
  * This annotation ensures the `operator<` is always defined. For types that
  * don't have `operator<`, such as `std::unordered_map`, we will convert it to
  * a sorted `std::vector<pair<K*, V*>>` to do the comparison.
@@ -428,15 +428,3 @@ struct EnableCustomTypeOrdering {}
  */
 @scope.Service
 struct GenerateServiceMethodDecorator {}
-
-/**
- * Marks a structured type as non-orderable, marking `operator<` as deleted.
- * This is useful when types should never be ordered. By default, `operator<` is
- * always declared, but depending on whether or not the type's shape is considered
- * orderable, it may or may not be defined. See `EnableCustomTypeOrdering` for more
- * details.
- * Note: The unstructured `cpp_noncomparable` annotation has priority over this one &
- * will cause `operator==` && `operator<` to *not* be declared or defined.
- */
-@scope.Structured
-struct NonOrderable {}

thrift/compiler/ast/uri.h

@@ -127,8 +127,6 @@ inline constexpr auto kCppEnableCustomTypeOrdering =
     "facebook.com/thrift/annotation/cpp/EnableCustomTypeOrdering";
 inline constexpr auto kCppGenerateServiceMethodDecorator =
     "facebook.com/thrift/annotation/cpp/GenerateServiceMethodDecorator";
-inline constexpr auto kCppNonOrderable =
-    "facebook.com/thrift/annotation/cpp/NonOrderable";
 
 // Java:
 inline constexpr auto kJavaMutableUri =

thrift/compiler/generate/t_mstch_cpp2_generator.cc

@@ -1619,7 +1619,6 @@ class cpp_mstch_struct : public mstch_struct {
              &cpp_mstch_struct::cpp_declare_equal_to},
             {"struct:cpp_noncopyable", &cpp_mstch_struct::cpp_noncopyable},
             {"struct:cpp_noncomparable", &cpp_mstch_struct::cpp_noncomparable},
-            {"struct:cpp_nonorderable?", &cpp_mstch_struct::cpp_nonorderable},
             {"struct:is_eligible_for_constexpr?",
              &cpp_mstch_struct::is_eligible_for_constexpr},
             {"struct:virtual", &cpp_mstch_struct::cpp_virtual},
@@ -1797,11 +1796,6 @@ class cpp_mstch_struct : public mstch_struct {
     return struct_->has_unstructured_annotation(
         {"cpp.noncomparable", "cpp2.noncomparable"});
   }
-
-  mstch::node cpp_nonorderable() {
-    return struct_->has_structured_annotation(kCppNonOrderable);
-  }
-
   mstch::node is_eligible_for_constexpr() {
     return is_eligible_for_constexpr_(struct_) ||
         struct_->has_unstructured_annotation({"cpp.methods", "cpp2.methods"});

thrift/compiler/generate/templates/cpp2/module_types.cpp.mustache

@@ -117,9 +117,7 @@ std::string_view {{struct:cpp_underlying_name}}::__fbthrift_get_class_name() {
 {{#struct:is_struct_orderable?}}
 
 
-{{^struct:cpp_nonorderable?}}
 {{> module_types_cpp/struct_operator_less}}
-{{/struct:cpp_nonorderable?}}
 {{/struct:is_struct_orderable?}}
 {{/struct:cpp_noncomparable}}
 
@@ -140,9 +138,7 @@ std::string_view {{struct:cpp_underlying_name}}::__fbthrift_get_class_name() {
 {{#struct:is_struct_orderable?}}
 
 
-{{^struct:cpp_nonorderable?}}
 {{> module_types_cpp/union_operator_less}}
-{{/struct:cpp_nonorderable?}}
 {{/struct:is_struct_orderable?}}
 {{/struct:cpp_noncomparable}}
 

thrift/compiler/generate/templates/cpp2/module_types.h.mustache

@@ -230,7 +230,7 @@ class {{#struct:exception?}}FOLLY_EXPORT {{/struct:exception?}}{{struct:cpp_unde
 {{^struct:cpp_noncomparable}}
 
   bool operator==(const {{struct:cpp_underlying_name}}&) const;
-  bool operator<(const {{struct:cpp_underlying_name}}&) const{{#struct:cpp_nonorderable?}} = delete{{/struct:cpp_nonorderable?}};
+  bool operator<(const {{struct:cpp_underlying_name}}&) const;
 {{/struct:cpp_noncomparable}}
 {{> module_types_h/union_setters}}
 
@@ -341,7 +341,7 @@ class {{#struct:exception?}}FOLLY_EXPORT {{/struct:exception?}}{{struct:cpp_unde
 {{^struct:cpp_noncomparable}}
 
   bool operator==(const {{struct:cpp_underlying_name}}&) const;
-  bool operator<(const {{struct:cpp_underlying_name}}&) const{{#struct:cpp_nonorderable?}} = delete{{/struct:cpp_nonorderable?}};
+  bool operator<(const {{struct:cpp_underlying_name}}&) const;
 {{/struct:cpp_noncomparable}}
 {{#struct:fields?}}
 {{> module_types_h/field_ref}}

thrift/compiler/test/fixtures/adapter/out/android/gen-android/com/facebook/thrift/annotation/cpp_deprecated/EnableCustomTypeOrdering.java

@@ -26,7 +26,7 @@
 /**
  * If there are custom types in thrift structure (e.g., `std::unordered_map` field),
  * We won't define `operator<` automatically (unless URI exists, but that's about
- * to change). Note that `operator<` is always declared, unless `@cpp.NonOrderable` is used.
+ * to change). Note that `operator<` is always declared.
  * This annotation ensures the `operator<` is always defined. For types that
  * don't have `operator<`, such as `std::unordered_map`, we will convert it to
  * a sorted `std::vector<pair<K*, V*>>` to do the comparison.

thrift/compiler/test/fixtures/adapter/out/android/gen-android/com/facebook/thrift/annotation/cpp_deprecated/NonOrderable.java

@@ -2496,7 +2496,7 @@ public function readFromJson(string $jsonText): void {
 /**
  * If there are custom types in thrift structure (e.g., `std::unordered_map` field),
  * We won't define `operator<` automatically (unless URI exists, but that's about
- * to change). Note that `operator<` is always declared, unless `@cpp.NonOrderable` is used.
+ * to change). Note that `operator<` is always declared.
  * This annotation ensures the `operator<` is always defined. For types that
  * don't have `operator<`, such as `std::unordered_map`, we will convert it to
  * a sorted `std::vector<pair<K*, V*>>` to do the comparison.
@@ -2671,93 +2671,3 @@ public function readFromJson(string $jsonText): void {
 
 }
 
-/**
- * Marks a structured type as non-orderable, marking `operator<` as deleted.
- * This is useful when types should never be ordered. By default, `operator<` is
- * always declared, but depending on whether or not the type's shape is considered
- * orderable, it may or may not be defined. See `EnableCustomTypeOrdering` for more
- * details.
- * Note: The unstructured `cpp_noncomparable` annotation has priority over this one &
- * will cause `operator==` && `operator<` to *not* be declared or defined.
- *
- * Original thrift struct:-
- * NonOrderable
- */
-<<\ThriftTypeInfo(shape('uri' => 'facebook.com/thrift/annotation/cpp/NonOrderable'))>>
-class NonOrderable implements \IThriftSyncStruct, \IThriftStructMetadata, \IThriftShapishSyncStruct {
-  use \ThriftSerializationTrait;
-
-  const \ThriftStructTypes::TSpec SPEC = dict[
-  ];
-  const dict<string, int> FIELDMAP = dict[
-  ];
-
-  const type TConstructorShape = shape(
-  );
-
-  const type TShape = shape(
-  );
-  const int STRUCTURAL_ID = 957977401221134810;
-
-  public function __construct()[] {
-  }
-
-  public static function withDefaultValues()[]: this {
-    return new static();
-  }
-
-  public static function fromShape(self::TConstructorShape $shape)[]: this {
-    return new static(
-    );
-  }
-
-  public function getName()[]: string {
-    return 'NonOrderable';
-  }
-
-  public static function getStructMetadata()[]: \tmeta_ThriftStruct {
-    return \tmeta_ThriftStruct::fromShape(
-      shape(
-        "name" => "cpp.NonOrderable",
-        "is_union" => false,
-      )
-    );
-  }
-
-  public static function getAllStructuredAnnotations()[write_props]: \TStructAnnotations {
-    return shape(
-      'struct' => dict[
-        '\facebook\thrift\annotation\Structured' => \facebook\thrift\annotation\Structured::fromShape(
-          shape(
-          )
-        ),
-      ],
-      'fields' => dict[
-      ],
-    );
-  }
-
-  public static function __fromShape(self::TShape $shape)[]: this {
-    return new static(
-    );
-  }
-
-  public function __toShape()[]: self::TShape {
-    return shape(
-    );
-  }
-  public function getInstanceKey()[write_props]: string {
-    return \TCompactSerializer::serialize($this);
-  }
-
-  public function readFromJson(string $jsonText): void {
-    $parsed = json_decode($jsonText, true);
-
-    if ($parsed === null || !($parsed is KeyedContainer<_, _>)) {
-      throw new \TProtocolException("Cannot parse the given json string.");
-    }
-
-  }
-
-}
-

thrift/compiler/test/fixtures/adapter/out/hack/gen-hack/cpp_types.php

@@ -26,7 +26,7 @@
 /**
  * If there are custom types in thrift structure (e.g., `std::unordered_map` field),
  * We won't define `operator<` automatically (unless URI exists, but that's about
- * to change). Note that `operator<` is always declared, unless `@cpp.NonOrderable` is used.
+ * to change). Note that `operator<` is always declared.
  * This annotation ensures the `operator<` is always defined. For types that
  * don't have `operator<`, such as `std::unordered_map`, we will convert it to
  * a sorted `std::vector<pair<K*, V*>>` to do the comparison.