From a826c589dfc10c542deba7ca3343a462e02d6bde Mon Sep 17 00:00:00 2001
From: Mason Reed <mason@vector35.com>
Date: Sun, 4 May 2025 19:10:56 -0400
Subject: [Rust] Simplify `BnStrCompatible` trait

Followup to https://github.com/Vector35/binaryninja-api/pull/5897/

This simplifies usage of the trait in user code, should just be able to `to_cstr` to get the cstr repr and then call `as_ptr`.

Co-authored-by: Michael Krasnitski <michael.krasnitski@gmail.com>
---
 rust/src/websocket/provider.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rust/src/websocket/provider.rs')

diff --git a/rust/src/websocket/provider.rs b/rust/src/websocket/provider.rs
index 2d01fbc3..48c198d2 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::{BnStrCompatible, BnString};
+use crate::string::{AsCStr, BnString};
 use crate::websocket::client;
 use crate::websocket::client::{CoreWebsocketClient, WebsocketClient};
 use binaryninjacore_sys::*;
@@ -11,7 +11,7 @@ pub fn register_websocket_provider<W>(name: &str) -> &'static mut W
 where
     W: WebsocketProvider,
 {
-    let name = name.into_bytes_with_nul();
+    let name = name.to_cstr();
     let provider_uninit = MaybeUninit::uninit();
     // SAFETY: Websocket provider is never freed
     let leaked_provider = Box::leak(Box::new(provider_uninit));
@@ -80,8 +80,8 @@ impl CoreWebsocketProvider {
         unsafe { Array::new(result, count, ()) }
     }
 
-    pub fn by_name<S: BnStrCompatible>(name: S) -> Option<CoreWebsocketProvider> {
-        let name = name.into_bytes_with_nul();
+    pub fn by_name<S: AsCStr>(name: S) -> Option<CoreWebsocketProvider> {
+        let name = name.to_cstr();
         let result =
             unsafe { BNGetWebsocketProviderByName(name.as_ref().as_ptr() as *const c_char) };
         NonNull::new(result).map(|h| unsafe { Self::from_raw(h) })
-- 
cgit v1.3.1