summary refs log tree commit diff
path: root/sys_util/src/mmap.rs
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2019-07-22 22:12:09 -0700
committerCommit Bot <commit-bot@chromium.org>2019-07-24 02:22:23 +0000
commite19cae8c6a9504b66c4eba74c59560302ab405f0 (patch)
treec8fca531ae6b2fb609f323cfd2bb046538288d93 /sys_util/src/mmap.rs
parentc3bee1f8c3fcfc9f62ab858cf0f0c58a373d2855 (diff)
downloadcrosvm-e19cae8c6a9504b66c4eba74c59560302ab405f0.tar
crosvm-e19cae8c6a9504b66c4eba74c59560302ab405f0.tar.gz
crosvm-e19cae8c6a9504b66c4eba74c59560302ab405f0.tar.bz2
crosvm-e19cae8c6a9504b66c4eba74c59560302ab405f0.tar.lz
crosvm-e19cae8c6a9504b66c4eba74c59560302ab405f0.tar.xz
crosvm-e19cae8c6a9504b66c4eba74c59560302ab405f0.tar.zst
crosvm-e19cae8c6a9504b66c4eba74c59560302ab405f0.zip
tree-wide: Use new trait object syntax
A few places were using the old syntax without `dyn`. Nightly compilers
have started warning more aggressively, so fix up the last of those.

Signed-off-by: Dylan Reid <dgreid@chromium.org>
Change-Id: I4df49b4a27a62acfd8c542cec903e4c5b31bedcc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1715576
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'sys_util/src/mmap.rs')
-rw-r--r--sys_util/src/mmap.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys_util/src/mmap.rs b/sys_util/src/mmap.rs
index 3d1e577..18414d5 100644
--- a/sys_util/src/mmap.rs
+++ b/sys_util/src/mmap.rs
@@ -248,7 +248,7 @@ impl MemoryMapping {
         size: usize,
         prot: c_int,
         flags: c_int,
-        fd: Option<(&AsRawFd, usize)>,
+        fd: Option<(&dyn AsRawFd, usize)>,
     ) -> Result<MemoryMapping> {
         let mut flags = flags;
         // If addr is provided, set the FIXED flag, and validate addr alignment
@@ -459,7 +459,7 @@ impl MemoryMapping {
     pub fn read_to_memory(
         &self,
         mut mem_offset: usize,
-        src: &AsRawFd,
+        src: &dyn AsRawFd,
         mut count: usize,
     ) -> Result<()> {
         self.range_end(mem_offset, count)
@@ -518,7 +518,7 @@ impl MemoryMapping {
     pub fn write_from_memory(
         &self,
         mut mem_offset: usize,
-        dst: &AsRawFd,
+        dst: &dyn AsRawFd,
         mut count: usize,
     ) -> Result<()> {
         self.range_end(mem_offset, count)
@@ -715,7 +715,7 @@ impl MemoryMappingArena {
         offset: usize,
         size: usize,
         prot: Protection,
-        fd: Option<(&AsRawFd, usize)>,
+        fd: Option<(&dyn AsRawFd, usize)>,
     ) -> Result<()> {
         self.validate_range(offset, size)?;