From 2feab2ee2b54ba5389c312698480b2b222664fd4 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Fri, 21 Feb 2020 13:55:49 -0800
Subject: [PATCH] fixes

---
 tests/main.rs    | 13 ++++++++-----
 tests/trivial.rs |  7 ++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/main.rs b/tests/main.rs
index 836a20c659..a8ec2c5096 100644
--- a/tests/main.rs
+++ b/tests/main.rs
@@ -1,8 +1,7 @@
 use proptest::prelude::*;
 use std::convert::TryFrom;
 use wiggle_runtime::{
-    GuestArray, GuestError, GuestErrorType, GuestPtr, GuestPtrMut, GuestRef, GuestRefMut,
-    GuestString,
+    GuestArray, GuestError, GuestPtr, GuestPtrMut, GuestRef, GuestRefMut, GuestString,
 };
 use wiggle_test::{HostMemory, MemArea};
 
@@ -803,7 +802,11 @@ impl HelloStringExercise {
                 },
             )
             .prop_filter("non-overlapping pointers", |e| {
-                non_overlapping_set(&[&e.string_ptr_loc, &e.string_len_loc, &e.return_ptr_loc])
+                MemArea::non_overlapping_set(&[
+                    &e.string_ptr_loc,
+                    &e.string_len_loc,
+                    &e.return_ptr_loc,
+                ])
             })
             .boxed()
     }
@@ -811,7 +814,7 @@ impl HelloStringExercise {
     pub fn test(&self) {
         let mut ctx = WasiCtx::new();
         let mut host_memory = HostMemory::new();
-        let mut guest_memory = GuestMemory::new(host_memory.as_mut_ptr(), host_memory.len() as u32);
+        let mut guest_memory = host_memory.guest_memory();
 
         // Populate string length
         *guest_memory
@@ -880,7 +883,7 @@ impl CookieCutterExercise {
     pub fn test(&self) {
         let mut ctx = WasiCtx::new();
         let mut host_memory = HostMemory::new();
-        let mut guest_memory = GuestMemory::new(host_memory.as_mut_ptr(), host_memory.len() as u32);
+        let mut guest_memory = host_memory.guest_memory();
 
         let res = foo::cookie_cutter(
             &mut ctx,
diff --git a/tests/trivial.rs b/tests/trivial.rs
index 8eb8fdccfe..36ca5d3ca5 100644
--- a/tests/trivial.rs
+++ b/tests/trivial.rs
@@ -1,9 +1,6 @@
 use proptest::prelude::*;
-use std::convert::TryFrom;
-use wiggle_runtime::{
-    GuestArray, GuestError, GuestErrorType, GuestPtr, GuestPtrMut, GuestRef, GuestRefMut,
-};
-use wiggle_test::{HostMemory, MemArea};
+use wiggle_runtime::GuestError;
+use wiggle_test::HostMemory;
 
 mod ctx;
 use ctx::WasiCtx;