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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e1ceaa6bae6d36ba7199fa1e1365fc3ff5e8760c9bcd135c04b20271abb809
-  data.tar.gz: 4243104440c31977c7a1bc5209506e6961b23547127c2271eea644802c7a2d42
+  metadata.gz: d94f8b93e55a27a3410fcb82bc31813828c160df232be3f90965e3a305237d64
+  data.tar.gz: ef56d43ae3e64562a8857aa97c114daedf0ddf18ffa20010869889969c39284d
 SHA512:
-  metadata.gz: a4701ee22a007b216f7050d00fa9fdc6d047568410cfe133ee53d842a35048bf1260f6f506743b0e7b64ee006a826eff0dffa3663d1d27b00d93c04251fe7973
-  data.tar.gz: 01c92c6e7ebe10bbd0a9b87ea83ae440d9f341b141cce3127182f46bea8fafa2bc6707be337d2fc9b96893561e2306e19764a8b3a3a5bbd10c185edcddb61cb4
+  metadata.gz: ea81fdb00939c9daa8e55e113617f2f549f04b8a5663277b9d12cc660069c885f6576d3b65e1bdff2a191cd3771a3fecb60be61e6ad4ed818589c01d2e0acc39
+  data.tar.gz: ef23eca5189f357ca1269055d8a2544284727920bae698d3dc9266d89d60cf7d50b2ad3a610130981d47d0bbabecd1cf351f5b09cad9cf0c3729070dec9205ad

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