diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-03-11 12:36:30 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-13 18:37:55 -0700 |
commit | 3df3552e4d62d60aac3bc33a4ee9468e7514202f (patch) | |
tree | ce416fe0ebf7bce37cec60a0db744bf037cd8add /src/plugin | |
parent | d49adc9005a300dbae60bd8ecb12ea620fc0fd31 (diff) | |
download | crosvm-3df3552e4d62d60aac3bc33a4ee9468e7514202f.tar crosvm-3df3552e4d62d60aac3bc33a4ee9468e7514202f.tar.gz crosvm-3df3552e4d62d60aac3bc33a4ee9468e7514202f.tar.bz2 crosvm-3df3552e4d62d60aac3bc33a4ee9468e7514202f.tar.lz crosvm-3df3552e4d62d60aac3bc33a4ee9468e7514202f.tar.xz crosvm-3df3552e4d62d60aac3bc33a4ee9468e7514202f.tar.zst crosvm-3df3552e4d62d60aac3bc33a4ee9468e7514202f.zip |
lints: Enforce sorted order for enum variants
To avoid wasting time re-sorting these things (CL:1492612). https://docs.rs/remain Disclaimer: I wrote the macro. This CL adds #[sorted] attributes to those Error enums that seemed to have made some effort to be in sorted order. TEST=cargo check TEST=cargo check --all-features TEST=cargo check --target aarch64-unknown-linux-gnu TEST=emerge-nami crosvm TEST=local kokoro CQ-DEPEND=CL:1524247 Change-Id: I89685ced05e2f149fa189ca509bc14c70aebb531 Reviewed-on: https://chromium-review.googlesource.com/1515998 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 'src/plugin')
-rw-r--r-- | src/plugin/mod.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs index 052b057..f37f2eb 100644 --- a/src/plugin/mod.rs +++ b/src/plugin/mod.rs @@ -23,6 +23,7 @@ use libc::{ }; use protobuf::ProtobufError; +use remain::sorted; use io_jail::{self, Minijail}; use kvm::{Datamatch, IoeventAddress, Kvm, Vcpu, VcpuExit, Vm}; @@ -41,6 +42,7 @@ const MAX_DATAGRAM_SIZE: usize = 4096; const MAX_VCPU_DATAGRAM_SIZE: usize = 0x40000; /// An error that occurs during the lifetime of a plugin process. +#[sorted] pub enum Error { CloneEventFd(SysError), CloneVcpuSocket(io::Error), @@ -95,18 +97,20 @@ pub enum Error { }, SignalFd(SignalFdError), SpawnVcpu(io::Error), + TapEnable(TapError), TapOpen(TapError), TapSetIp(TapError), - TapSetNetmask(TapError), TapSetMacAddress(TapError), - TapEnable(TapError), + TapSetNetmask(TapError), ValidateTapFd(SysError), } impl Display for Error { + #[remain::check] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { use self::Error::*; + #[sorted] match self { CloneEventFd(e) => write!(f, "failed to clone eventfd: {}", e), CloneVcpuSocket(e) => write!(f, "failed to clone vcpu socket: {}", e), @@ -160,11 +164,11 @@ impl Display for Error { ), SignalFd(e) => write!(f, "failed to read signal fd: {}", e), SpawnVcpu(e) => write!(f, "error spawning vcpu thread: {}", e), + TapEnable(e) => write!(f, "error enabling tap device: {}", e), TapOpen(e) => write!(f, "error opening tap device: {}", e), TapSetIp(e) => write!(f, "error setting tap ip: {}", e), - TapSetNetmask(e) => write!(f, "error setting tap netmask: {}", e), TapSetMacAddress(e) => write!(f, "error setting tap mac address: {}", e), - TapEnable(e) => write!(f, "error enabling tap device: {}", e), + TapSetNetmask(e) => write!(f, "error setting tap netmask: {}", e), ValidateTapFd(e) => write!(f, "failed to validate raw tap fd: {}", e), } } |