1 files changed, 13 insertions, 13 deletions

diff --git a/rust/src/binary_view/memory_map.rs b/rust/src/binary_view/memory_map.rs
index 6b6d3d20..ad7c8ea1 100644
--- a/rust/src/binary_view/memory_map.rs
+++ b/rust/src/binary_view/memory_map.rs
@@ -3,7 +3,7 @@ use crate::data_buffer::DataBuffer;
 use crate::file_accessor::FileAccessor;
 use crate::rc::Ref;
 use crate::segment::SegmentFlags;
-use crate::string::{AsCStr, BnString};
+use crate::string::{BnString, IntoCStr};
 use binaryninjacore_sys::*;
 
 #[derive(PartialEq, Eq, Hash)]
@@ -42,7 +42,7 @@ impl MemoryMap {
 
     pub fn add_binary_memory_region(
         &mut self,
-        name: impl AsCStr,
+        name: impl IntoCStr,
         start: u64,
         view: &BinaryView,
         segment_flags: Option<SegmentFlags>,
@@ -61,7 +61,7 @@ impl MemoryMap {
 
     pub fn add_data_memory_region(
         &mut self,
-        name: impl AsCStr,
+        name: impl IntoCStr,
         start: u64,
         data: &DataBuffer,
         segment_flags: Option<SegmentFlags>,
@@ -80,7 +80,7 @@ impl MemoryMap {
 
     pub fn add_remote_memory_region(
         &mut self,
-        name: impl AsCStr,
+        name: impl IntoCStr,
         start: u64,
         accessor: &mut FileAccessor,
         segment_flags: Option<SegmentFlags>,
@@ -97,7 +97,7 @@ impl MemoryMap {
         }
     }
 
-    pub fn remove_memory_region(&mut self, name: impl AsCStr) -> bool {
+    pub fn remove_memory_region(&mut self, name: impl IntoCStr) -> bool {
         let name_raw = name.to_cstr();
         unsafe { BNRemoveMemoryRegion(self.view.handle, name_raw.as_ptr()) }
     }
@@ -109,44 +109,44 @@ impl MemoryMap {
         }
     }
 
-    pub fn memory_region_flags(&self, name: impl AsCStr) -> SegmentFlags {
+    pub fn memory_region_flags(&self, name: impl IntoCStr) -> SegmentFlags {
         let name_raw = name.to_cstr();
         let flags_raw = unsafe { BNGetMemoryRegionFlags(self.view.handle, name_raw.as_ptr()) };
         SegmentFlags::from_raw(flags_raw)
     }
 
-    pub fn set_memory_region_flags(&mut self, name: impl AsCStr, flags: SegmentFlags) -> bool {
+    pub fn set_memory_region_flags(&mut self, name: impl IntoCStr, flags: SegmentFlags) -> bool {
         let name_raw = name.to_cstr();
         unsafe { BNSetMemoryRegionFlags(self.view.handle, name_raw.as_ptr(), flags.into_raw()) }
     }
 
-    pub fn is_memory_region_enabled(&self, name: impl AsCStr) -> bool {
+    pub fn is_memory_region_enabled(&self, name: impl IntoCStr) -> bool {
         let name_raw = name.to_cstr();
         unsafe { BNIsMemoryRegionEnabled(self.view.handle, name_raw.as_ptr()) }
     }
 
-    pub fn set_memory_region_enabled(&mut self, name: impl AsCStr, enabled: bool) -> bool {
+    pub fn set_memory_region_enabled(&mut self, name: impl IntoCStr, enabled: bool) -> bool {
         let name_raw = name.to_cstr();
         unsafe { BNSetMemoryRegionEnabled(self.view.handle, name_raw.as_ptr(), enabled) }
     }
 
     // TODO: Should we just call this is_memory_region_relocatable?
-    pub fn is_memory_region_rebaseable(&self, name: impl AsCStr) -> bool {
+    pub fn is_memory_region_rebaseable(&self, name: impl IntoCStr) -> bool {
         let name_raw = name.to_cstr();
         unsafe { BNIsMemoryRegionRebaseable(self.view.handle, name_raw.as_ptr()) }
     }
 
-    pub fn set_memory_region_rebaseable(&mut self, name: impl AsCStr, enabled: bool) -> bool {
+    pub fn set_memory_region_rebaseable(&mut self, name: impl IntoCStr, enabled: bool) -> bool {
         let name_raw = name.to_cstr();
         unsafe { BNSetMemoryRegionRebaseable(self.view.handle, name_raw.as_ptr(), enabled) }
     }
 
-    pub fn memory_region_fill(&self, name: impl AsCStr) -> u8 {
+    pub fn memory_region_fill(&self, name: impl IntoCStr) -> u8 {
         let name_raw = name.to_cstr();
         unsafe { BNGetMemoryRegionFill(self.view.handle, name_raw.as_ptr()) }
     }
 
-    pub fn set_memory_region_fill(&mut self, name: impl AsCStr, fill: u8) -> bool {
+    pub fn set_memory_region_fill(&mut self, name: impl IntoCStr, fill: u8) -> bool {
         let name_raw = name.to_cstr();
         unsafe { BNSetMemoryRegionFill(self.view.handle, name_raw.as_ptr(), fill) }
     }