From de5d29b3e6fe6b2a86eeb1f1c90d11290448d320 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 17 Jul 2024 09:49:22 -0700 Subject: [PATCH] update bindings for more const correctness --- Cargo.lock | 28 ++++++++++++++-------------- libcsp-sys/src/lib.rs | 2 +- src/lib.rs | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e53e5c4..33d575f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,15 +4,15 @@ version = 3 [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "cc" -version = "1.0.98" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" [[package]] name = "equivalent" @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "num_enum" @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -142,18 +142,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", diff --git a/libcsp-sys/src/lib.rs b/libcsp-sys/src/lib.rs index 515ad60..a4a9e7c 100644 --- a/libcsp-sys/src/lib.rs +++ b/libcsp-sys/src/lib.rs @@ -483,7 +483,7 @@ extern "C" { pub fn csp_buffer_get(unused: usize) -> *mut csp_packet_t; #[doc = " Free buffer (from task context).\n\n @param[in] buffer buffer to free. NULL is handled gracefully."] - pub fn csp_buffer_free(buffer: *mut ::core::ffi::c_void); + pub fn csp_buffer_free(buffer: *const ::core::ffi::c_void); #[doc = " Print connection table to stdout."] pub fn csp_conn_print_table(); diff --git a/src/lib.rs b/src/lib.rs index 44e9b30..a79a879 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -604,7 +604,7 @@ pub fn csp_conn_print_table() { pub fn csp_buffer_free(packet: impl Into) { // SAFETY: FFI call and the Rust type system actually ensure the correct type // is free'd here, while also taking the packet by value. - unsafe { ffi::csp_buffer_free(packet.into().0 as *mut libc::c_void) } + unsafe { ffi::csp_buffer_free(packet.into().0 as *const libc::c_void) } } /// Rust wrapper for [ffi::csp_transaction_persistent].