From 9dadf92c16da5cd21def79ae39ca98803c9208ec Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Mon, 5 May 2025 13:17:30 -0400 Subject: [Rust] Rename `AsCStr` to `IntoCStr` --- rust/src/websocket/client.rs | 10 +++++----- rust/src/websocket/provider.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'rust/src/websocket') diff --git a/rust/src/websocket/client.rs b/rust/src/websocket/client.rs index 8e2c6db0..aa69c381 100644 --- a/rust/src/websocket/client.rs +++ b/rust/src/websocket/client.rs @@ -1,5 +1,5 @@ use crate::rc::{Ref, RefCountable}; -use crate::string::{AsCStr, BnString}; +use crate::string::{BnString, IntoCStr}; use binaryninjacore_sys::*; use std::ffi::{c_char, c_void, CStr}; use std::ptr::NonNull; @@ -21,8 +21,8 @@ pub trait WebsocketClient: Sync + Send { fn connect(&self, host: &str, headers: I) -> bool where I: IntoIterator, - K: AsCStr, - V: AsCStr; + K: IntoCStr, + V: IntoCStr; fn write(&self, data: &[u8]) -> bool; @@ -77,8 +77,8 @@ impl CoreWebsocketClient { ) -> bool where I: IntoIterator, - K: AsCStr, - V: AsCStr, + K: IntoCStr, + V: IntoCStr, C: WebsocketClientCallback, { let url = host.to_cstr(); diff --git a/rust/src/websocket/provider.rs b/rust/src/websocket/provider.rs index 9cc1de84..40235c2b 100644 --- a/rust/src/websocket/provider.rs +++ b/rust/src/websocket/provider.rs @@ -1,5 +1,5 @@ use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Ref}; -use crate::string::{AsCStr, BnString}; +use crate::string::{BnString, IntoCStr}; use crate::websocket::client; use crate::websocket::client::{CoreWebsocketClient, WebsocketClient}; use binaryninjacore_sys::*; @@ -80,7 +80,7 @@ impl CoreWebsocketProvider { unsafe { Array::new(result, count, ()) } } - pub fn by_name(name: S) -> Option { + pub fn by_name(name: S) -> Option { let name = name.to_cstr(); let result = unsafe { BNGetWebsocketProviderByName(name.as_ptr()) }; NonNull::new(result).map(|h| unsafe { Self::from_raw(h) }) -- cgit v1.3.1