From 64cd5eae5778b86f6e498a6fa1b1962693aa5a46 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 15 Apr 2019 15:56:35 -0700 Subject: edition: Eliminate ref keyword As described in: https://doc.rust-lang.org/edition-guide/rust-2018/ownership-and-lifetimes/default-match-bindings.html which also covers the new mental model that the Rust Book will use for teaching binding modes and has been found to be more friendly for both beginners and experienced users. Before: match *opt { Some(ref v) => ..., None => ..., } After: match opt { Some(v) => ..., None => ..., } TEST=cargo check --all-features TEST=local kokoro Change-Id: I3c5800a9be36aaf5d3290ae3bd3116f699cb00b7 Reviewed-on: https://chromium-review.googlesource.com/1566669 Commit-Ready: David Tolnay Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: Daniel Verkamp --- sys_util/src/guest_memory.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys_util/src/guest_memory.rs') diff --git a/sys_util/src/guest_memory.rs b/sys_util/src/guest_memory.rs index 6586e6b..25b4d4b 100644 --- a/sys_util/src/guest_memory.rs +++ b/sys_util/src/guest_memory.rs @@ -93,8 +93,8 @@ pub struct GuestMemory { impl AsRawFd for GuestMemory { fn as_raw_fd(&self) -> RawFd { - match self.memfd { - Some(ref memfd) => memfd.as_raw_fd(), + match &self.memfd { + Some(memfd) => memfd.as_raw_fd(), None => panic!("GuestMemory is not backed by a memfd"), } } @@ -165,8 +165,8 @@ impl GuestMemory { } } - let mapping = match memfd { - Some(ref memfd) => MemoryMapping::from_fd_offset(memfd, range.1 as usize, offset), + let mapping = match &memfd { + Some(memfd) => MemoryMapping::from_fd_offset(memfd, range.1 as usize, offset), None => MemoryMapping::new(range.1 as usize), } .map_err(Error::MemoryMappingFailed)?; -- cgit 1.4.1