Skip to content

Commit 486a09a

Browse files
committed
misc: (breaking change) renamed reference memory access methods
1 parent 3073fa5 commit 486a09a

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

raw_struct/src/reference.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,18 @@ impl<T: ?Sized + Viewable, MemoryError: 'static> Reference<T, MemoryError> {
5757
}
5858
}
5959

60-
// TODO: Rename base_address
61-
pub fn reference_address(&self) -> u64 {
60+
pub fn base_address(&self) -> u64 {
6261
let memory = self.inner.object_memory();
6362
memory.address
6463
}
6564

66-
// TODO: Rename base_memory
67-
pub fn reference_memory(&self) -> &Arc<dyn MemoryView<Error = MemoryError>> {
65+
pub fn base_memory(&self) -> &Arc<dyn MemoryView<Error = MemoryError>> {
6866
let memory = self.inner.object_memory();
6967
&memory.inner
7068
}
7169

7270
pub fn cast<V: ?Sized + Viewable>(&self) -> Reference<V, MemoryError> {
73-
Reference::new(self.reference_memory().clone(), self.reference_address())
71+
Reference::new(self.base_memory().clone(), self.base_address())
7472
}
7573
}
7674

@@ -79,15 +77,15 @@ where
7977
Copy<T>: marker::Copy,
8078
{
8179
pub fn copy(&self) -> Result<Copy<T>, AccessError<MemoryError>> {
82-
let memory = self.reference_memory().deref();
83-
Copy::<T>::read_object(memory, self.reference_address()).map_err(|err| AccessError {
80+
let memory = self.base_memory().deref();
81+
Copy::<T>::read_object(memory, self.base_address()).map_err(|err| AccessError {
8482
source: err,
8583

8684
object: T::name(),
8785
member: None,
8886

8987
mode: AccessMode::Read,
90-
offset: self.reference_address(),
88+
offset: self.base_address(),
9189
size: T::MEMORY_SIZE,
9290
})
9391
}

0 commit comments

Comments
 (0)