From 6264254065bbae9d89f51cf3330379b7ace09592 Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Sat, 3 May 2025 23:15:17 -0400 Subject: [Rust] Return `String` instead of `BnString` for cases where lossy conversion can be tolerated Still need to go and audit all usage, but realistically the most important places to give the user control are with symbols, where the data can come from non utf8 sources This is still incomplete, I just looked for usage of -> BnString so any other variant was omitted. --- rust/src/component.rs | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) (limited to 'rust/src/component.rs') diff --git a/rust/src/component.rs b/rust/src/component.rs index 497c1f57..72441c52 100644 --- a/rust/src/component.rs +++ b/rust/src/component.rs @@ -86,10 +86,10 @@ impl Component { Ref::new(Self { handle }) } - pub fn guid(&self) -> BnString { + pub fn guid(&self) -> String { let result = unsafe { BNComponentGetGuid(self.handle.as_ptr()) }; assert!(!result.is_null()); - unsafe { BnString::from_raw(result) } + unsafe { BnString::into_string(result) } } /// Add function to this component. @@ -145,10 +145,10 @@ impl Component { } /// Original name of the component - pub fn display_name(&self) -> BnString { + pub fn display_name(&self) -> String { let result = unsafe { BNComponentGetDisplayName(self.handle.as_ptr()) }; assert!(!result.is_null()); - unsafe { BnString::from_raw(result) } + unsafe { BnString::into_string(result) } } /// Original name set for this component @@ -158,10 +158,10 @@ impl Component { /// remain what was originally set (e.g. "MyComponentName") /// If this component has a duplicate name and is moved to a component where none of its siblings share its name, /// .name will return the original "MyComponentName" - pub fn name(&self) -> BnString { + pub fn name(&self) -> String { let result = unsafe { BNComponentGetOriginalName(self.handle.as_ptr()) }; assert!(!result.is_null()); - unsafe { BnString::from_raw(result) } + unsafe { BnString::into_string(result) } } pub fn set_name(&self, name: S) { @@ -309,20 +309,3 @@ unsafe impl CoreArrayProviderInner for Component { Guard::new(Self::from_raw(raw_ptr), context) } } - -// TODO: Should we keep this? -pub trait IntoComponentGuid { - fn component_guid(self) -> BnString; -} - -impl IntoComponentGuid for &Component { - fn component_guid(self) -> BnString { - self.guid() - } -} - -impl IntoComponentGuid for S { - fn component_guid(self) -> BnString { - BnString::new(self) - } -} -- cgit v1.3.1