use intptr_t instead of ssize_t; diplomat-tool 0.5.2 (#327)

* use intptr_t instead of ssize_t; diplomat-tol 0.5.2 * Update example
rust-diplomat · Apr 28, 2023 · 880bf82 · 880bf82
1 parent c0d9cc2
commit 880bf82
Show file tree

Hide file tree

Showing 14 changed files with 102 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -14,8 +14,8 @@ crate-type = ["staticlib", "rlib", "cdylib"]
 [dependencies]
 diplomat = { path = "../macro" }
 diplomat-runtime = { path = "../runtime" }
-icu = "1.0.0"
-writeable = "0.5.0"
-fixed_decimal = "0.5.1"
-icu_provider = { version = "1.0", features = ["serde"] }
-icu_testdata = { version = "1.0" }
+icu = "1.2"
+writeable = "0.5.2"
+fixed_decimal = "0.5.3"
+icu_provider = { version = "1.2", features = ["serde"] }
+icu_testdata = { version = "1.2" }
diff --git a/example/c/include/diplomat_runtime.h b/example/c/include/diplomat_runtime.h
diff --git a/example/c2/include/diplomat_runtime.h b/example/c2/include/diplomat_runtime.h
diff --git a/example/cpp/include/diplomat_runtime.h b/example/cpp/include/diplomat_runtime.h
diff --git a/example/cpp2/include/diplomat_runtime.h b/example/cpp2/include/diplomat_runtime.h
diff --git a/feature_tests/c/include/diplomat_runtime.h b/feature_tests/c/include/diplomat_runtime.h
diff --git a/feature_tests/c2/include/diplomat_runtime.h b/feature_tests/c2/include/diplomat_runtime.h
diff --git a/feature_tests/cpp/include/diplomat_runtime.h b/feature_tests/cpp/include/diplomat_runtime.h
diff --git a/feature_tests/cpp2/include/diplomat_runtime.h b/feature_tests/cpp2/include/diplomat_runtime.h
diff --git a/tool/Cargo.toml b/tool/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "diplomat-tool"
 description = "Tool for generating FFI bindings for various languages"
-version = "0.5.1"
+version = "0.5.2"
 authors = [
     "Shadaj Laddad <shadaj@users.noreply.github.com>",
     "Manish Goregaokar <manishsmail@gmail.com>",

diff --git a/tool/src/c/runtime.h b/tool/src/c/runtime.h
@@ -54,7 +54,7 @@ MAKE_SLICE_VIEW(I32, int32_t)
 MAKE_SLICE_VIEW(U32, uint32_t)
 MAKE_SLICE_VIEW(I64, int64_t)
 MAKE_SLICE_VIEW(U64, uint64_t)
-MAKE_SLICE_VIEW(Isize, ssize_t)
+MAKE_SLICE_VIEW(Isize, intptr_t)
 MAKE_SLICE_VIEW(Usize, size_t)
 MAKE_SLICE_VIEW(F32, float)
 MAKE_SLICE_VIEW(F64, double)

diff --git a/tool/src/c/types.rs b/tool/src/c/types.rs
@@ -118,7 +118,7 @@ pub fn c_type_for_prim(prim: &PrimitiveType) -> &'static str {
         PrimitiveType::u64 => "uint64_t",
         PrimitiveType::i128 => panic!("i128 not supported in C"),
         PrimitiveType::u128 => panic!("u128 not supported in C"),
-        PrimitiveType::isize => "ssize_t",
+        PrimitiveType::isize => "intptr_t",
         PrimitiveType::usize => "size_t",
         PrimitiveType::f32 => "float",
         PrimitiveType::f64 => "double",

diff --git a/tool/src/c2/formatter.rs b/tool/src/c2/formatter.rs
@@ -130,7 +130,7 @@ impl<'tcx> CFormatter<'tcx> {
             PrimitiveType::Int(IntType::I64) => "int64_t",
             PrimitiveType::Int(IntType::U64) => "uint64_t",
             PrimitiveType::Int128(_) => panic!("i128 not supported in C"),
-            PrimitiveType::IntSize(IntSizeType::Isize) => "ssize_t",
+            PrimitiveType::IntSize(IntSizeType::Isize) => "intptr_t",
             PrimitiveType::IntSize(IntSizeType::Usize) => "size_t",
             PrimitiveType::Float(FloatType::F32) => "float",
             PrimitiveType::Float(FloatType::F64) => "double",