--- a/third_party/rust/encoding_c/.cargo-checksum.json
+++ b/third_party/rust/encoding_c/.cargo-checksum.json
@@ -1,1 +1,1 @@
-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".gitignore":"3effb8c580299a86c7c816e456406be2763f0e0954c66fed2ce5ce06e750f997","CONTRIBUTING.md":"8cd9262df951c4b42078aa55064ca3b8ef2676c06b8fc7c281c02ee3f1ae04a8","COPYRIGHT":"65fb11bb8d2aac1ea00620273e0595ff71f4a335d25b67acbccbaa1b9ad5a409","Cargo.toml":"e7532cd5f9aba02726720ec8707914e6f5a8ce24401415233def34ec778d31c8","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"90df74ddb43e7f5aa5068890eacc151ecca7c997c9515cf17aea30b8734075bf","README.md":"1d360a54ac30d2ed84cada251eeaae0ef43c6f2b771856d6c181b592e8f6a471","build-disabled.rs":"d65ed45d33ce834ab9f9f7c5f308e0a72605aa34ede6dca45a2077a2deee5cfa","include/encoding_rs.h":"dc015596eb8b4b0b2e79569a519e81c14301db8f5b96b4013989645a67a73422","include/encoding_rs_cpp.h":"f93c0e2b3e1ec4f1efb1fcee1f43e8d1424faf3e26d7084404c5ba5f2f6a2c4d","include/encoding_rs_statics.h":"800e6aa5aafe2fa3a3826ed0c0a0da34ca9495ff9c75c84845d44b14f5be1078","src/lib.rs":"69ac99046085286c00534b6d107df269cfdd67fc488190d690d2d3e8c01bf916"},"package":"45ef700aebe8c5fb44f081a54ab400f4f6b002a426bc5332381c108f49713432"}
\ No newline at end of file
+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".gitignore":"3effb8c580299a86c7c816e456406be2763f0e0954c66fed2ce5ce06e750f997","CONTRIBUTING.md":"8cd9262df951c4b42078aa55064ca3b8ef2676c06b8fc7c281c02ee3f1ae04a8","COPYRIGHT":"65fb11bb8d2aac1ea00620273e0595ff71f4a335d25b67acbccbaa1b9ad5a409","Cargo.toml":"e7532cd5f9aba02726720ec8707914e6f5a8ce24401415233def34ec778d31c8","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"90df74ddb43e7f5aa5068890eacc151ecca7c997c9515cf17aea30b8734075bf","README.md":"1d360a54ac30d2ed84cada251eeaae0ef43c6f2b771856d6c181b592e8f6a471","build-disabled.rs":"d65ed45d33ce834ab9f9f7c5f308e0a72605aa34ede6dca45a2077a2deee5cfa","include/encoding_rs.h":"dc015596eb8b4b0b2e79569a519e81c14301db8f5b96b4013989645a67a73422","include/encoding_rs_cpp.h":"f93c0e2b3e1ec4f1efb1fcee1f43e8d1424faf3e26d7084404c5ba5f2f6a2c4d","include/encoding_rs_statics.h":"4991c82d2e1b80469590a7993456fa7c80dc01eb0a9e08ac6ad85911720740d1","src/lib.rs":"69ac99046085286c00534b6d107df269cfdd67fc488190d690d2d3e8c01bf916"},"package":"45ef700aebe8c5fb44f081a54ab400f4f6b002a426bc5332381c108f49713432"}
\ No newline at end of file

--- a/third_party/rust/encoding_c/include/encoding_rs_statics.h
+++ b/third_party/rust/encoding_c/include/encoding_rs_statics.h
@@ -18,16 +18,20 @@
 
 #ifndef ENCODING_RS_ENCODING
 #define ENCODING_RS_ENCODING Encoding
 #ifndef __cplusplus
 typedef struct Encoding_ Encoding;
 #endif
 #endif
 
+#ifndef ENCODING_RS_CONST_ENCODING_PTR
+#define ENCODING_RS_CONST_ENCODING_PTR const ENCODING_RS_ENCODING*
+#endif
+
 #ifndef ENCODING_RS_ENCODER
 #define ENCODING_RS_ENCODER Encoder
 #ifndef __cplusplus
 typedef struct Encoder_ Encoder;
 #endif
 #endif
 
 #ifndef ENCODING_RS_DECODER
@@ -40,128 +44,128 @@ typedef struct Decoder_ Decoder;
 #define INPUT_EMPTY 0
 
 #define OUTPUT_FULL 0xFFFFFFFF
 
 // x-mac-cyrillic
 #define ENCODING_NAME_MAX_LENGTH 14
 
 /// The Big5 encoding.
-extern const ENCODING_RS_ENCODING* const BIG5_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const BIG5_ENCODING;
 
 /// The EUC-JP encoding.
-extern const ENCODING_RS_ENCODING* const EUC_JP_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const EUC_JP_ENCODING;
 
 /// The EUC-KR encoding.
-extern const ENCODING_RS_ENCODING* const EUC_KR_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const EUC_KR_ENCODING;
 
 /// The GBK encoding.
-extern const ENCODING_RS_ENCODING* const GBK_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const GBK_ENCODING;
 
 /// The IBM866 encoding.
-extern const ENCODING_RS_ENCODING* const IBM866_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const IBM866_ENCODING;
 
 /// The ISO-2022-JP encoding.
-extern const ENCODING_RS_ENCODING* const ISO_2022_JP_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_2022_JP_ENCODING;
 
 /// The ISO-8859-10 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_10_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_10_ENCODING;
 
 /// The ISO-8859-13 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_13_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_13_ENCODING;
 
 /// The ISO-8859-14 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_14_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_14_ENCODING;
 
 /// The ISO-8859-15 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_15_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_15_ENCODING;
 
 /// The ISO-8859-16 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_16_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_16_ENCODING;
 
 /// The ISO-8859-2 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_2_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_2_ENCODING;
 
 /// The ISO-8859-3 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_3_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_3_ENCODING;
 
 /// The ISO-8859-4 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_4_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_4_ENCODING;
 
 /// The ISO-8859-5 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_5_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_5_ENCODING;
 
 /// The ISO-8859-6 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_6_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_6_ENCODING;
 
 /// The ISO-8859-7 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_7_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_7_ENCODING;
 
 /// The ISO-8859-8 encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_8_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_8_ENCODING;
 
 /// The ISO-8859-8-I encoding.
-extern const ENCODING_RS_ENCODING* const ISO_8859_8_I_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const ISO_8859_8_I_ENCODING;
 
 /// The KOI8-R encoding.
-extern const ENCODING_RS_ENCODING* const KOI8_R_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const KOI8_R_ENCODING;
 
 /// The KOI8-U encoding.
-extern const ENCODING_RS_ENCODING* const KOI8_U_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const KOI8_U_ENCODING;
 
 /// The Shift_JIS encoding.
-extern const ENCODING_RS_ENCODING* const SHIFT_JIS_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const SHIFT_JIS_ENCODING;
 
 /// The UTF-16BE encoding.
-extern const ENCODING_RS_ENCODING* const UTF_16BE_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const UTF_16BE_ENCODING;
 
 /// The UTF-16LE encoding.
-extern const ENCODING_RS_ENCODING* const UTF_16LE_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const UTF_16LE_ENCODING;
 
 /// The UTF-8 encoding.
-extern const ENCODING_RS_ENCODING* const UTF_8_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const UTF_8_ENCODING;
 
 /// The gb18030 encoding.
-extern const ENCODING_RS_ENCODING* const GB18030_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const GB18030_ENCODING;
 
 /// The macintosh encoding.
-extern const ENCODING_RS_ENCODING* const MACINTOSH_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const MACINTOSH_ENCODING;
 
 /// The replacement encoding.
-extern const ENCODING_RS_ENCODING* const REPLACEMENT_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const REPLACEMENT_ENCODING;
 
 /// The windows-1250 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1250_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1250_ENCODING;
 
 /// The windows-1251 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1251_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1251_ENCODING;
 
 /// The windows-1252 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1252_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1252_ENCODING;
 
 /// The windows-1253 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1253_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1253_ENCODING;
 
 /// The windows-1254 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1254_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1254_ENCODING;
 
 /// The windows-1255 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1255_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1255_ENCODING;
 
 /// The windows-1256 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1256_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1256_ENCODING;
 
 /// The windows-1257 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1257_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1257_ENCODING;
 
 /// The windows-1258 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_1258_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_1258_ENCODING;
 
 /// The windows-874 encoding.
-extern const ENCODING_RS_ENCODING* const WINDOWS_874_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const WINDOWS_874_ENCODING;
 
 /// The x-mac-cyrillic encoding.
-extern const ENCODING_RS_ENCODING* const X_MAC_CYRILLIC_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const X_MAC_CYRILLIC_ENCODING;
 
 /// The x-user-defined encoding.
-extern const ENCODING_RS_ENCODING* const X_USER_DEFINED_ENCODING;
+extern ENCODING_RS_CONST_ENCODING_PTR const X_USER_DEFINED_ENCODING;
 
 #endif // encoding_rs_statics_h_