Auto-generate files after cl/705148623

protocolbuffers · Dec 11, 2024 · 2598c6d · 2598c6d
1 parent 20ea8af
commit 2598c6d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 16 deletions.
diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c
@@ -1183,7 +1183,7 @@ static int64_t jsondec_strtoint64(jsondec* d, upb_StringView str) {
 static void jsondec_checkempty(jsondec* d, upb_StringView str,
                                const upb_FieldDef* f) {
   if (str.size != 0) return;
-  d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+  d->result = kUpb_JsonDecodeResult_Error;
   upb_Status_SetErrorFormat(d->status,
                             "Empty string is not a valid number (field: %s). "
                             "This will be an error in a future version.",
@@ -1291,7 +1291,7 @@ static upb_MessageValue jsondec_double(jsondec* d, const upb_FieldDef* f) {
         char* end;
         val.double_val = strtod(str.data, &end);
         if (end != str.data + str.size) {
-          d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+          d->result = kUpb_JsonDecodeResult_Error;
           upb_Status_SetErrorFormat(
               d->status,
               "Non-number characters in quoted number (field: %s). "

diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h
@@ -13404,7 +13404,6 @@ enum { upb_JsonDecode_IgnoreUnknown = 1 };
 
 enum {
   kUpb_JsonDecodeResult_Ok = 0,
-  kUpb_JsonDecodeResult_OkWithEmptyStringNumerics = 1,
   kUpb_JsonDecodeResult_Error = 2,
 };
 

diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -1183,7 +1183,7 @@ static int64_t jsondec_strtoint64(jsondec* d, upb_StringView str) {
 static void jsondec_checkempty(jsondec* d, upb_StringView str,
                                const upb_FieldDef* f) {
   if (str.size != 0) return;
-  d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+  d->result = kUpb_JsonDecodeResult_Error;
   upb_Status_SetErrorFormat(d->status,
                             "Empty string is not a valid number (field: %s). "
                             "This will be an error in a future version.",
@@ -1291,7 +1291,7 @@ static upb_MessageValue jsondec_double(jsondec* d, const upb_FieldDef* f) {
         char* end;
         val.double_val = strtod(str.data, &end);
         if (end != str.data + str.size) {
-          d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+          d->result = kUpb_JsonDecodeResult_Error;
           upb_Status_SetErrorFormat(
               d->status,
               "Non-number characters in quoted number (field: %s). "

diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -13406,7 +13406,6 @@ enum { upb_JsonDecode_IgnoreUnknown = 1 };
 
 enum {
   kUpb_JsonDecodeResult_Ok = 0,
-  kUpb_JsonDecodeResult_OkWithEmptyStringNumerics = 1,
   kUpb_JsonDecodeResult_Error = 2,
 };
 

diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc
-Original file line number
+Diff line change
@@ Expand Up / @@ -13404,7 +13404,6 @@ enum { upb_JsonDecode_IgnoreUnknown = 1 }; @@
     enum {
       kUpb_JsonDecodeResult_Ok = 0,
-      kUpb_JsonDecodeResult_OkWithEmptyStringNumerics = 1,
       kUpb_JsonDecodeResult_Error = 2,
     };
@@ Expand Down @@