Rust reflection: simplify dependencies, fix Android build compatibility

MODULE.bazel

@@ -43,6 +43,10 @@ bazel_dep(
     name = "rules_nodejs",
     version = "6.3.3",
 )
+bazel_dep(
+    name = "rules_shell",
+    version = "0.3.0",
+)
 bazel_dep(
     name = "rules_swift",
     version = "1.18.0",

rust/flatbuffers/Cargo.toml

@@ -17,7 +17,7 @@ std = []
 serialize = ["serde"]
 
 [dependencies]
-bitflags = "1.2.1"
+bitflags = "2.8.0"
 serde = { version = "1.0", optional = true }
 
 [build-dependencies]

rust/reflection/Cargo.toml

@@ -5,8 +5,6 @@ edition = "2021"
 
 [dependencies]
 flatbuffers = { path = "../flatbuffers"}
-escape_string = "0.1.2"
-stdint = "0.2.0"
-num = "0.4.1"
+num-traits = "0.2.19"
 anyhow = "1.0.75"
 thiserror = "1.0"

rust/reflection/src/lib.rs

@@ -29,11 +29,9 @@ use flatbuffers::{
 use reflection_generated::reflection::{BaseType, Field, Object, Schema};
 
 use core::mem::size_of;
-use escape_string::escape;
-use num::traits::float::Float;
-use num::traits::int::PrimInt;
-use num::traits::FromPrimitive;
-use stdint::uintmax_t;
+use num_traits::float::Float;
+use num_traits::int::PrimInt;
+use num_traits::FromPrimitive;
 use thiserror::Error;
 
 #[derive(Error, Debug, PartialEq)]
@@ -541,7 +539,9 @@ pub unsafe fn set_string(
 
     if delta != 0 {
         // Rounds the delta up to the nearest multiple of the maximum int size to keep the types after the insersion point aligned.
-        let mask = (size_of::<uintmax_t>() - 1) as isize;
+        // stdint crate defines intmax_t as an alias for c_long; use it directly to avoid extra
+        // dependency.
+        let mask = (size_of::<core::ffi::c_long>() - 1) as isize;
         let offset = (delta + mask) & !mask;
         let mut visited_vec = vec![false; buf.len()];
 
@@ -715,7 +715,8 @@ unsafe fn get_any_value_string(
                     }
                     let mut field_value = get_any_field_string(&table, &field, schema);
                     if field.type_().base_type() == BaseType::String {
-                        field_value = escape(field_value.as_str()).to_string();
+                        // Escape the string
+                        field_value = format!("{:?}", field_value.as_str());
                     }
                     s += field.name();
                     s += ": ";