diff options
author | David Tolnay <dtolnay@chromium.org> | 2018-12-01 17:49:30 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-12-03 20:32:03 -0800 |
commit | 5bbbf610828e975fd308b90543359a85ef59b67f (patch) | |
tree | 4cd736628475d702b7ac45feb2e359c3fb74d220 /net_util | |
parent | 21fb34fb937678d85e9bfa4c721ab4a29196c764 (diff) | |
download | crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.gz crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.bz2 crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.lz crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.xz crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.zst crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.zip |
lint: Resolve the easier clippy lints
Hopefully the changes are self-explanatory and uncontroversial. This eliminates much of the noise from `cargo clippy` and, for my purposes, gives me a reasonable way to use it as a tool when writing and reviewing code. Here is the Clippy invocation I was using: cargo +nightly clippy -- -W clippy::correctness -A renamed_and_removed_lints -Aclippy::{blacklisted_name,borrowed_box,cast_lossless,cast_ptr_alignment,enum_variant_names,identity_op,if_same_then_else,mut_from_ref,needless_pass_by_value,new_without_default,new_without_default_derive,or_fun_call,ptr_arg,should_implement_trait,single_match,too_many_arguments,trivially_copy_pass_by_ref,unreadable_literal,unsafe_vector_initialization,useless_transmute} TEST=cargo check --features wl-dmabuf,gpu,usb-emulation TEST=boot linux Change-Id: I55eb1b4a72beb2f762480e3333a921909314a0a2 Reviewed-on: https://chromium-review.googlesource.com/1356911 Commit-Ready: David Tolnay <dtolnay@chromium.org> Tested-by: David Tolnay <dtolnay@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'net_util')
-rw-r--r-- | net_util/src/lib.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net_util/src/lib.rs b/net_util/src/lib.rs index 06c3f17..78a0cb8 100644 --- a/net_util/src/lib.rs +++ b/net_util/src/lib.rs @@ -36,11 +36,11 @@ pub type Result<T> = std::result::Result<T, Error>; impl Error { pub fn sys_error(&self) -> SysError { - match self { - &Error::CreateSocket(e) => e, - &Error::OpenTun(e) => e, - &Error::CreateTap(e) => e, - &Error::IoctlError(e) => e, + match *self { + Error::CreateSocket(e) => e, + Error::OpenTun(e) => e, + Error::CreateTap(e) => e, + Error::IoctlError(e) => e, } } } @@ -107,7 +107,7 @@ pub struct MacAddress { impl MacAddress { pub fn octets(&self) -> [u8; 6usize] { - self.addr.clone() + self.addr } } @@ -115,7 +115,7 @@ impl FromStr for MacAddress { type Err = MacAddressError; fn from_str(s: &str) -> std::result::Result<Self, Self::Err> { - let octets: Vec<&str> = s.split(":").collect(); + let octets: Vec<&str> = s.split(':').collect(); if octets.len() != 6usize { return Err(MacAddressError::InvalidNumOctets(octets.len())); } @@ -209,7 +209,7 @@ impl TapT for Tap { // We just checked that the fd is valid. let tuntap = unsafe { File::from_raw_fd(fd) }; - const TUNTAP_DEV_FORMAT: &'static [u8; 8usize] = b"vmtap%d\0"; + const TUNTAP_DEV_FORMAT: &[u8; 8usize] = b"vmtap%d\0"; // This is pretty messy because of the unions used by ifreq. Since we // don't call as_mut on the same union field more than once, this block @@ -239,10 +239,10 @@ impl TapT for Tap { } } - // Safe since only the name is accessed, and it's cloned out. + // Safe since only the name is accessed, and it's copied out. Ok(Tap { tap_file: tuntap, - if_name: unsafe { ifreq.ifr_ifrn.ifrn_name.as_ref().clone() }, + if_name: unsafe { *ifreq.ifr_ifrn.ifrn_name.as_ref() }, }) } |