google-protobuf 3.22.0.rc.2-arm64-darwin → 3.22.0.rc.3-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf86bd95157e98e06a4d279841c2613aee57833aaeb0e2ab33459a598029535
-  data.tar.gz: 61f05138cd265b788cc3bd5c4cb3179fb030eea4327b1996968b94e887d51765
+  metadata.gz: ffcc3310033e7ecb403084de3eecf59f478bb61c830ddd0ceaa2f44352372117
+  data.tar.gz: 35416e7ef78cede3a55b1d231d4ee39850d61bfffa61ae8e03e87557610af89c
 SHA512:
-  metadata.gz: 151a36dcdc256baf598c65ad3ac9ba6f96ae5ceee6209d1f5084a4a66605b11b4f8bc49c37cb1e2cf51e4e84ffb0c147387deb6c8f9d937f924e832dda3f0f9e
-  data.tar.gz: 69fc4575c68c1bf9e791d88e322a7dfffe76ad3404d3cfb152c727391ac388a87ade7866ec87b622a1268b296debcf598eea097982faf1cdca39cfaecd962d11
+  metadata.gz: bef8c88e52312e8bd217fd37f45d14e2522b4f1aa51697fd5221379a67f0d3093e1e1e666895c86165e3bef1d38185092c8ef2d6af3be11148d38b9c135cc149
+  data.tar.gz: 027f7680365001b2dd8bb1dd90c5139e194a736d505f12c275f24d1232ab9a4edb0be789e34ff7a9cf0acb97e38622ab68083479c028516c7a34dcb87047153a

data/ext/google/protobuf_c/extconf.rb

@@ -7,19 +7,18 @@ ext_name = "google/protobuf_c"
 dir_config(ext_name)
 
 if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/
-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement -I$(srcdir)/third_party/utf8_range"
+  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
 else
   $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
 end
 
-
 if RUBY_PLATFORM =~ /linux/
   # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
   $LDFLAGS += " -Wl,-wrap,memcpy"
 end
 
 $VPATH << "$(srcdir)/third_party/utf8_range"
-$INCFLAGS << "$(srcdir)/third_party/utf8_range"
+$INCFLAGS += " -I$(srcdir)/third_party/utf8_range"
 
 $srcs = ["protobuf.c", "convert.c", "defs.c", "message.c",
          "repeated_field.c", "map.c", "ruby-upb.c", "wrap_memcpy.c",

data/ext/google/protobuf_c/message.c

@@ -243,15 +243,6 @@ static int extract_method_call(VALUE method_name, Message* self,
   if (Match(m, name, f, o, "clear_", "")) return METHOD_CLEAR;
   if (Match(m, name, f, o, "has_", "?") &&
       (*o || (*f && upb_FieldDef_HasPresence(*f)))) {
-    // Disallow oneof hazzers for proto3.
-    // TODO(haberman): remove this test when we are enabling oneof hazzers for
-    // proto3.
-    if (*f && !upb_FieldDef_IsSubMessage(*f) &&
-        upb_FieldDef_RealContainingOneof(*f) &&
-        upb_MessageDef_Syntax(upb_FieldDef_ContainingType(*f)) !=
-            kUpb_Syntax_Proto2) {
-      return METHOD_UNKNOWN;
-    }
     return METHOD_PRESENCE;
   }
   if (Match(m, name, f, o, "", "_as_value") && *f &&
@@ -1287,12 +1278,12 @@ VALUE build_module_from_enumdesc(VALUE _enumdesc) {
     int32_t value = upb_EnumValueDef_Number(ev);
     if (name[0] < 'A' || name[0] > 'Z') {
       if (name[0] >= 'a' && name[0] <= 'z') {
-        name[0] -= 32; // auto capitalize
+        name[0] -= 32;  // auto capitalize
       } else {
         rb_warn(
-          "Enum value '%s' does not start with an uppercase letter "
-          "as is required for Ruby constants.",
-          name);
+            "Enum value '%s' does not start with an uppercase letter "
+            "as is required for Ruby constants.",
+            name);
       }
     }
     rb_define_const(mod, name, INT2NUM(value));