rename the pointer read/write methods to read and write

these names were artifacts of some early confusion / bad design i made
in the traits. read and write are much simpler names!

also, change a ptr_mut to ptr where we just read the contents in the
argument marshalling for structs. this has no effect, but it is more
correct.
This commit is contained in:
Pat Hickey
2020-02-26 10:44:04 -08:00
committed by Jakub Konka
parent c8ea27553d
commit 25a411d7fd
6 changed files with 14 additions and 14 deletions

View File

@@ -107,7 +107,7 @@ impl ReduceExcusesExcercise {
.ptr_mut(self.array_ptr_loc.ptr)
.expect("ptr to array mut");
for ptr in &self.excuse_ptr_locs {
next.write_ptr_to_guest(
next.write(
&guest_memory
.ptr::<types::Excuse>(ptr.ptr)
.expect("ptr to Excuse value"),
@@ -203,7 +203,7 @@ impl PopulateExcusesExcercise {
.ptr_mut(self.array_ptr_loc.ptr)
.expect("ptr mut to the first element of array");
for ptr in &self.elements {
next.write_ptr_to_guest(
next.write(
&guest_memory
.ptr_mut::<types::Excuse>(ptr.ptr)
.expect("ptr mut to Excuse value"),

View File

@@ -54,7 +54,7 @@ impl pointers::Pointers for WasiCtx {
println!("input4 {:?}", input4);
// Write ptr value to mutable ptr:
input4_ptr_ptr.write_ptr_to_guest(&input2_ptr.as_immut());
input4_ptr_ptr.write(&input2_ptr.as_immut());
Ok(())
}

View File

@@ -428,12 +428,12 @@ impl ReturnPairPtrsExercise {
let ret_first_ptr: GuestPtr<i32> = ptr_pair_int_ptrs
.cast::<GuestPtr<i32>>(0u32)
.expect("extract ptr to first element in struct")
.clone_from_guest()
.read()
.expect("read ptr to first element in struct");
let ret_second_ptr: GuestPtr<i32> = ptr_pair_int_ptrs
.cast::<GuestPtr<i32>>(4u32)
.expect("extract ptr to second element in struct")
.clone_from_guest()
.read()
.expect("read ptr to second element in struct");
assert_eq!(
self.input_first,