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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac38bcf7bc64e0fde46bfba2380e62f02ea262ea7ff2102e76ddce083385e1e4
-  data.tar.gz: a20bf4b6e63e0b96a1a1c079584eb665ffcdd75b3226a342a7010a59530ffeff
+  metadata.gz: b3a45e3a58c21025d46f2e9a86e6cdb9a98e5a70d014341f03612ae8158ce7a7
+  data.tar.gz: 712649b7a3f67ccfa75b34e2903841abe37ab203334d44c9d2f6977feb7c50a1
 SHA512:
-  metadata.gz: f72368247b7e3d2ae9ceb0172ea43f79659562ac32dc205aef156e60addda1ce07898df2b9c5aa9ac15bbdceaf692e7fde2bc570c40f0e0bf285bb60cb1f127a
-  data.tar.gz: '04359f464dc8570a9c1b9d36f13b9b8e65fcb4cce295844500d094ee13a87a0d18bd7a32bb7477cda98563de24890f15d47bccab38818a53b736a9a5ade0071b'
+  metadata.gz: 44844d38c84cc13655d5a121d183bef7696f1a3c248c740c8853623afbf6c1442a56f304a5e5f9aa21ef3ffac5491de2c828d4894c4bb5820ca28c9b3fd68ec3
+  data.tar.gz: 4c6d276d4903fd1cea4288e40f4374262d910adc9a8d9aa52f4a42240c2565cb83a42ed84de87b246db67537e708dadaaf825869a9584e04570a01270d9333f9

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));