Switch to prost, general tp update

Author: plule

Cargo.toml

@@ -19,22 +19,21 @@ exclude = ["images/"]
 
 [dependencies]
 prost = "0.14"
-byteorder = "1.5.0"
-num_enum = "0.7.3"
-log = "0.4.26"
-derive_more = { version = "2.0", features = ["display"] }
+byteorder = "1"
+num_enum = "0.7"
+log = "0.4"
+derive_more = { version = "2", features = ["display"] }
 dfhack-proto = { version = "0.11.0", path = "dfhack-proto" }
 thiserror = "2"
 
 
 [dev-dependencies]
 bmp = "0.5.0"
-ctor = "0.4.1"
+ctor = "0.6"
 lazy_static = "1.5.0"
-rand = "0.9.0"
-env_logger = "0.11.7"
+rand = "0.10"
+env_logger = "0.11"
 
 
 [features]
-test-with-df = ["reflection"]
-reflection = ["dfhack-proto/reflection"]
+test-with-df = []

dfhack-proto/Cargo.toml

@@ -10,10 +10,10 @@ license = "MIT OR Apache-2.0"
 categories = ["api-bindings", "game-development", "games"]
 
 [features]
-reflection = []
 
 [dependencies]
 prost = "0.14"
+serde = { version = "1", features = ["derive"] }
 
 [build-dependencies]
 prost = "0.14"

dfhack-proto/build.rs

@@ -50,33 +50,35 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-env-changed=DFHACK_REGEN");
 
-    let protoc = get_protoc();
-
-    let proto_include_dir = dfhack_proto_srcs::include_dir();
-    let protos = dfhack_proto_srcs::protos();
-
-    assert!(!protos.is_empty(), "No protobuf file for code generation.");
-
-    // Generate in the sources if DFHACK_REGEN is set
-    // in OUT_DIR otherwise.
-    // TODO It should always be OUT_DIR, then expose macros.
-    let out_path = match std::env::var("DFHACK_REGEN") {
-        Ok(_) => {
-            let dst = PathBuf::from("src/generated");
-            if dst.exists() {
-                std::fs::remove_dir_all(&dst).unwrap();
+    if std::env::var("DFHACK_REGEN").is_ok() {
+        let protoc = get_protoc();
+
+        let proto_include_dir = dfhack_proto_srcs::include_dir();
+        let protos = dfhack_proto_srcs::protos();
+
+        assert!(!protos.is_empty(), "No protobuf file for code generation.");
+
+        // Generate in the sources if DFHACK_REGEN is set
+        // in OUT_DIR otherwise.
+        // TODO It should always be OUT_DIR, then expose macros.
+        let out_path = match std::env::var("DFHACK_REGEN") {
+            Ok(_) => {
+                let dst = PathBuf::from("src/generated");
+                if dst.exists() {
+                    std::fs::remove_dir_all(&dst).unwrap();
+                }
+                std::fs::create_dir_all(&dst).unwrap();
+                dst
             }
-            std::fs::create_dir_all(&dst).unwrap();
-            dst
-        }
-        Err(_) => PathBuf::from(std::env::var("OUT_DIR").unwrap()),
-    };
+            Err(_) => PathBuf::from(std::env::var("OUT_DIR").unwrap()),
+        };
 
-    // Generate the protobuf message files
-    generate_messages_rs(&protoc, &protos, proto_include_dir, &out_path);
+        // Generate the protobuf message files
+        generate_messages_rs(&protoc, &protos, proto_include_dir, &out_path);
 
-    // Generate the plugin stubs
-    generate_stubs_rs(&protos, &out_path)
+        // Generate the plugin stubs
+        generate_stubs_rs(&protos, &out_path)
+    }
 }
 
 fn get_protoc() -> PathBuf {
@@ -101,13 +103,14 @@ fn messages_protoc_codegen(
 ) {
     prost_build::Config::new()
         .enable_type_names()
+        .type_attribute(".", "#[derive(serde::Serialize)]")
         .protoc_executable(protoc)
         .out_dir(out_path)
         .compile_protos(protos, &[include_dir])
         .unwrap();
 }
 
-fn generate_stubs_rs(protos: &Vec<PathBuf>, out_path: &Path) {
+fn generate_stubs_rs(protos: &[PathBuf], out_path: &Path) {
     let plugins = read_protos_rpcs(protos);
     let mut out_path = out_path.to_path_buf();
     out_path.push("stubs");
@@ -173,7 +176,6 @@ fn generate_stubs_mod_rs(plugins: &Vec<Plugin>, file: &mut TokenStream) {
             #plugins_impl
         }
 
-        #[cfg(feature = "reflection")]
         impl<TChannel: crate::Channel> crate::reflection::StubReflection for Stubs<TChannel> {
             fn list_methods() -> Vec<crate::reflection::RemoteProcedureDescriptor> {
                 let mut methods = Vec::new();
@@ -323,7 +325,6 @@ fn generate_stub_rs(plugin: &Plugin, file: &mut TokenStream) {
             #plugin_impl
         }
 
-        #[cfg(feature = "reflection")]
         impl<TChannel: crate::Channel> crate::reflection::StubReflection for #struct_ident<'_, TChannel> {
             fn list_methods() -> Vec<crate::reflection::RemoteProcedureDescriptor> {
                 vec![
@@ -334,7 +335,7 @@ fn generate_stub_rs(plugin: &Plugin, file: &mut TokenStream) {
     });
 }
 
-fn read_protos_rpcs(protos: &Vec<PathBuf>) -> Vec<Plugin> {
+fn read_protos_rpcs(protos: &[PathBuf]) -> Vec<Plugin> {
     let mut plugins = HashMap::<String, Plugin>::new();
 
     for proto in protos {

dfhack-proto/src/generated/messages/adventure_control.rs

@@ -1,4 +1,5 @@
 // This file is @generated by prost-build.
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MoveCommandParams {
     #[prost(message, optional, tag = "1")]
@@ -14,6 +15,7 @@ impl ::prost::Name for MoveCommandParams {
         "/AdventureControl.MoveCommandParams".into()
     }
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MovementOption {
     #[prost(message, optional, tag = "1")]
@@ -35,6 +37,7 @@ impl ::prost::Name for MovementOption {
         "/AdventureControl.MovementOption".into()
     }
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MenuContents {
     #[prost(enumeration = "AdvmodeMenu", optional, tag = "1")]
@@ -52,6 +55,7 @@ impl ::prost::Name for MenuContents {
         "/AdventureControl.MenuContents".into()
     }
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MiscMoveParams {
     #[prost(enumeration = "MiscMoveType", optional, tag = "1")]
@@ -67,6 +71,7 @@ impl ::prost::Name for MiscMoveParams {
         "/AdventureControl.MiscMoveParams".into()
     }
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum AdvmodeMenu {
@@ -228,6 +233,7 @@ impl AdvmodeMenu {
         }
     }
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum CarefulMovementType {
@@ -287,6 +293,7 @@ impl CarefulMovementType {
         }
     }
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum MiscMoveType {