diff options
| author | Alejandro Soto <alejandro@34project.org> | 2021-12-24 04:58:51 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2021-12-24 05:07:23 -0600 |
| commit | 311b2a40213aa48131a189f99dc4258d354c0c78 (patch) | |
| tree | 3f4fd971a7b94d07f11a8c878e0bc665bdf61f67 /src/proto.rs | |
| parent | 5afc15edaa593bdf7dd2ae7c542980d9d70b8321 (diff) | |
Fix old warnings
Diffstat (limited to '')
| -rw-r--r-- | src/proto.rs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/proto.rs b/src/proto.rs index 9816922..53c2123 100644 --- a/src/proto.rs +++ b/src/proto.rs @@ -4,7 +4,7 @@ use bitflags::bitflags; use bytemuck::{self, Pod}; use bytemuck_derive::{Pod, Zeroable}; use num_enum::TryFromPrimitive; -use std::{convert::TryFrom, ffi::CStr, fmt, mem::replace}; +use std::{convert::TryFrom, ffi::CStr, fmt, mem}; use crate::{util::display_or, FuseError, FuseResult}; @@ -778,17 +778,10 @@ impl<'a> TryFrom<&'a [u8]> for Request<'a> { return Err(BadLength); } - RequestBody::$op { prefix, data: replace(&mut bytes, &[]) } + RequestBody::$op { prefix, data: mem::take(&mut bytes) } } }; - /*($op:ident, $($field:ident),+) => { - { - $($field!($op, $field));+; - RequestBody::$op { $($field),+ } - } - };*/ - ($op:ident, $($fields:ident),+) => { { build_body!($op, $($fields),+); @@ -841,7 +834,7 @@ impl<'a> TryFrom<&'a [u8]> for Request<'a> { BatchForget => { prefix!(BatchForget, prefix); - let forgets = replace(&mut bytes, &[]); + let forgets = mem::take(&mut bytes); let forgets = bytemuck::try_cast_slice(forgets).map_err(|_| Truncated)?; if prefix.count as usize != forgets.len() { |
