diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-03-08 16:56:14 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-08 02:51:37 -0700 |
commit | fdac5ede468e0fddfe527d6108430ee932b02fc3 (patch) | |
tree | 398c2ace79eea2babb4439810c43b793068fd8cc /sys_util/src/lib.rs | |
parent | 98895ac05d42ed346a161035134600b0d0e0bb87 (diff) | |
download | crosvm-fdac5ede468e0fddfe527d6108430ee932b02fc3.tar crosvm-fdac5ede468e0fddfe527d6108430ee932b02fc3.tar.gz crosvm-fdac5ede468e0fddfe527d6108430ee932b02fc3.tar.bz2 crosvm-fdac5ede468e0fddfe527d6108430ee932b02fc3.tar.lz crosvm-fdac5ede468e0fddfe527d6108430ee932b02fc3.tar.xz crosvm-fdac5ede468e0fddfe527d6108430ee932b02fc3.tar.zst crosvm-fdac5ede468e0fddfe527d6108430ee932b02fc3.zip |
edition: Use dyn syntax for trait objects
Found by running: `cargo rustc -- -D bare_trait_objects` Bare trait objects like `&Trait` and `Box<Trait>` are soft-deprecated in 2018 edition and will start warning at some point. As part of this, I replaced `Box<Trait + 'static>` with `Box<dyn Trait>` because the 'static bound is implied for boxed trait objects. TEST=cargo check --all-features TEST=cargo check --target aarch64-unknown-linux-gnu TEST=local kokoro Change-Id: I41c4f13530bece8a34a8ed1c1afd7035b8f86f19 Reviewed-on: https://chromium-review.googlesource.com/1513059 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: David Tolnay <dtolnay@chromium.org>
Diffstat (limited to 'sys_util/src/lib.rs')
-rw-r--r-- | sys_util/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys_util/src/lib.rs b/sys_util/src/lib.rs index 81682cc..5f7827e 100644 --- a/sys_util/src/lib.rs +++ b/sys_util/src/lib.rs @@ -148,7 +148,7 @@ pub enum FlockOperation { /// Safe wrapper for flock(2) with the operation `op` and optionally `nonblocking`. The lock will be /// dropped automatically when `file` is dropped. #[inline(always)] -pub fn flock(file: &AsRawFd, op: FlockOperation, nonblocking: bool) -> Result<()> { +pub fn flock(file: &dyn AsRawFd, op: FlockOperation, nonblocking: bool) -> Result<()> { let mut operation = match op { FlockOperation::LockShared => libc::LOCK_SH, FlockOperation::LockExclusive => libc::LOCK_EX, @@ -177,7 +177,7 @@ pub enum FallocateMode { /// Safe wrapper for `fallocate()`. pub fn fallocate( - file: &AsRawFd, + file: &dyn AsRawFd, mode: FallocateMode, keep_size: bool, offset: u64, |