Merge commit '657bcfb5ad7501c1191d070bde98cdd9799c51b2' into upb_upgrade

third_party/upb/BUILD

@@ -146,10 +146,10 @@ cc_library(
 cc_library(
     name = "textformat",
     srcs = [
-        "upb/textencode.c",
+        "upb/text_encode.c",
     ],
     hdrs = [
-        "upb/textencode.h",
+        "upb/text_encode.h",
     ],
     visibility = ["//visibility:public"],
     deps = [

third_party/upb/CMakeLists.txt

@@ -89,8 +89,8 @@ target_link_libraries(reflection
   table
   upb)
 add_library(textformat
-  upb/textencode.c
-  upb/textencode.h)
+  upb/text_encode.c
+  upb/text_encode.h)
 target_link_libraries(textformat
   reflection)
 add_library(table INTERFACE)

third_party/upb/tests/conformance_upb.c

@@ -15,7 +15,7 @@
 #include "upb/decode.h"
 #include "upb/encode.h"
 #include "upb/reflection.h"
-#include "upb/textencode.h"
+#include "upb/text_encode.h"
 
 int test_count = 0;
 bool verbose = false;  /* Set to true to get req/resp printed on stderr. */
@@ -87,9 +87,9 @@ void serialize_text(const upb_msg *msg, const upb_msgdef *m, const ctx *c) {
   if (!conformance_ConformanceRequest_print_unknown_fields(c->request)) {
     opts |= UPB_TXTENC_SKIPUNKNOWN;
   }
-  len = upb_textencode(msg, m, c->symtab, opts, NULL, 0);
+  len = upb_text_encode(msg, m, c->symtab, opts, NULL, 0);
   data = upb_arena_malloc(c->arena, len + 1);
-  len2 = upb_textencode(msg, m, c->symtab, opts, data, len + 1);
+  len2 = upb_text_encode(msg, m, c->symtab, opts, data, len + 1);
   assert(len == len2);
   conformance_ConformanceResponse_set_text_payload(
       c->response, upb_strview_make(data, len));
@@ -153,7 +153,7 @@ void DoTest(const ctx* c) {
 void debug_print(const char *label, const upb_msg *msg, const upb_msgdef *m,
                  const ctx *c) {
   char buf[512];
-  upb_textencode(msg, m, c->symtab, UPB_TXTENC_SINGLELINE, buf, sizeof(buf));
+  upb_text_encode(msg, m, c->symtab, UPB_TXTENC_SINGLELINE, buf, sizeof(buf));
   fprintf(stderr, "%s: %s\n", label, buf);
 }
 

third_party/upb/upb/bindings/lua/msg.c

@@ -13,7 +13,7 @@
 #include "lauxlib.h"
 #include "upb/bindings/lua/upb.h"
 #include "upb/reflection.h"
-#include "upb/textencode.h"
+#include "upb/text_encode.h"
 
 #include "upb/port_def.inc"
 
@@ -905,13 +905,13 @@ static int lupb_msg_tostring(lua_State *L) {
   lua_getiuservalue(L, 1, LUPB_MSGDEF_INDEX);
   m = lupb_msgdef_check(L, -1);
 
-  size = upb_textencode(msg, m, NULL, 0, buf, sizeof(buf));
+  size = upb_text_encode(msg, m, NULL, 0, buf, sizeof(buf));
 
   if (size < sizeof(buf)) {
     lua_pushlstring(L, buf, size);
   } else {
     char *ptr = malloc(size + 1);
-    upb_textencode(msg, m, NULL, 0, ptr, size + 1);
+    upb_text_encode(msg, m, NULL, 0, ptr, size + 1);
     lua_pushlstring(L, ptr, size);
     free(ptr);
   }

third_party/upb/upb/textencode.c → third_party/upb/upb/text_encode.c

@@ -1,5 +1,5 @@
 
-#include "upb/textencode.h"
+#include "upb/text_encode.h"
 
 #include <ctype.h>
 #include <float.h>
@@ -376,9 +376,9 @@ size_t txtenc_nullz(txtenc *e, size_t size) {
   return ret;
 }
 
-size_t upb_textencode(const upb_msg *msg, const upb_msgdef *m,
-                      const upb_symtab *ext_pool, int options, char *buf,
-                      size_t size) {
+size_t upb_text_encode(const upb_msg *msg, const upb_msgdef *m,
+                       const upb_symtab *ext_pool, int options, char *buf,
+                       size_t size) {
   txtenc e;
 
   e.buf = buf;

third_party/upb/upb/textencode.h → third_party/upb/upb/text_encode.h

@@ -24,9 +24,9 @@ enum {
  * size (excluding NULL) is returned.  This means that a return value >= |size|
  * implies that the output was truncated.  (These are the same semantics as
  * snprintf()). */
-size_t upb_textencode(const upb_msg *msg, const upb_msgdef *m,
-                      const upb_symtab *ext_pool, int options, char *buf,
-                      size_t size);
+size_t upb_text_encode(const upb_msg *msg, const upb_msgdef *m,
+                       const upb_symtab *ext_pool, int options, char *buf,
+                       size_t size);
 
 #ifdef __cplusplus
 }  /* extern "C" */