Merge pull request #17 from melix99/empty-result

tdlib-tl-gen: Use "()" in place of the "Ok" type

Author: melix99

tdlib-tl-gen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tdlib-tl-gen"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Marco Melorio <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

tdlib-tl-gen/src/functions.rs

@@ -110,10 +110,15 @@ fn write_function<W: Write>(
         "            return Err(serde_json::from_value(response).unwrap())"
     )?;
     writeln!(file, "        }}")?;
-    writeln!(
-        file,
-        "        Ok(serde_json::from_value(response).unwrap())"
-    )?;
+
+    if rustifier::types::is_ok(&def.ty) {
+        writeln!(file, "        Ok(())")?;
+    } else {
+        writeln!(
+            file,
+            "        Ok(serde_json::from_value(response).unwrap())"
+        )?;
+    }
 
     writeln!(file, "    }}")?;
     Ok(())

tdlib-tl-gen/src/lib.rs

@@ -20,7 +20,7 @@ use tdlib_tl_parser::tl::{Definition, Type};
 
 /// Don't generate types for definitions of this type,
 /// since they are "core" types and treated differently.
-const SPECIAL_CASED_TYPES: [&str; 5] = ["Bool", "Bytes", "Int32", "Int53", "Int64"];
+const SPECIAL_CASED_TYPES: [&str; 6] = ["Bool", "Bytes", "Int32", "Int53", "Int64", "Ok"];
 
 fn ignore_type(ty: &Type) -> bool {
     SPECIAL_CASED_TYPES.iter().any(|&x| x == ty.name)

tdlib-tl-gen/src/rustifier.rs

@@ -168,6 +168,7 @@ pub mod types {
             "int64" => "i64",
             "string" => "String",
             "vector" => "Vec",
+            "Ok" => "()",
             _ => return None,
         })
     }
@@ -210,6 +211,10 @@ pub mod types {
     pub fn qual_name(ty: &Type, optional_generic_arg: bool) -> String {
         get_path(ty, optional_generic_arg)
     }
+
+    pub fn is_ok(ty: &Type) -> bool {
+        ty.name == "Ok"
+    }
 }
 
 pub mod parameters {

tdlib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tdlib"
-version = "0.1.2"
+version = "0.2.0"
 authors = ["Marco Melorio <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -32,7 +32,7 @@ serde_with = "1.12"
 
 [build-dependencies]
 system-deps = "6"
-tdlib-tl-gen = { path = "../tdlib-tl-gen", version = "0.1" }
+tdlib-tl-gen = { path = "../tdlib-tl-gen", version = "0.2" }
 tdlib-tl-parser = { path = "../tdlib-tl-parser", version = "0.1" }
 
 [dev-dependencies]