sys_util: Combine GuestMemory::with_regions and with_regions_mut

Every implementation of Fn also implements FnMut, so if some callback
can be passed to GuestMemory::with_regions then it could also have been
passed to GuestMemory::with_regions_mut.

This CL removes GuestMemory::with_regions and renames with_regions_mut
to with_regions.

TEST=cargo check

Change-Id: Ia4f168ff4eb4d45a5ee8f9413821ae244fb72ee1
Reviewed-on: https://chromium-review.googlesource.com/1378688
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: David Tolnay <dtolnay@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>

1 files changed, 1 insertions, 17 deletions

diff --git a/sys_util/src/guest_memory.rs b/sys_util/src/guest_memory.rs
index 6644ff2..157800c 100644
--- a/sys_util/src/guest_memory.rs
+++ b/sys_util/src/guest_memory.rs
@@ -142,23 +142,7 @@ impl GuestMemory {
     }
 
     /// Perform the specified action on each region's addresses.
-    pub fn with_regions<F, E>(&self, cb: F) -> result::Result<(), E>
-    where
-        F: Fn(usize, GuestAddress, usize, usize) -> result::Result<(), E>,
-    {
-        for (index, region) in self.regions.iter().enumerate() {
-            cb(
-                index,
-                region.guest_base,
-                region.mapping.size(),
-                region.mapping.as_ptr() as usize,
-            )?;
-        }
-        Ok(())
-    }
-
-    /// Perform the specified action on each region's addresses mutably.
-    pub fn with_regions_mut<F, E>(&self, mut cb: F) -> result::Result<(), E>
+    pub fn with_regions<F, E>(&self, mut cb: F) -> result::Result<(), E>
     where
         F: FnMut(usize, GuestAddress, usize, usize) -> result::Result<(), E>,
     {