summary refs log tree commit diff
path: root/x86_64/src
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-03-11 12:36:30 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-13 18:37:55 -0700
commit3df3552e4d62d60aac3bc33a4ee9468e7514202f (patch)
treece416fe0ebf7bce37cec60a0db744bf037cd8add /x86_64/src
parentd49adc9005a300dbae60bd8ecb12ea620fc0fd31 (diff)
downloadcrosvm-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 'x86_64/src')
-rw-r--r--x86_64/src/lib.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs
index de12a10..3272086 100644
--- a/x86_64/src/lib.rs
+++ b/x86_64/src/lib.rs
@@ -12,6 +12,7 @@ extern crate kernel_loader;
 extern crate kvm;
 extern crate kvm_sys;
 extern crate libc;
+extern crate remain;
 extern crate resources;
 extern crate sync;
 extern crate sys_util;
@@ -80,10 +81,12 @@ use arch::{RunnableLinuxVm, VmComponents};
 use devices::{PciConfigIo, PciDevice, PciInterruptPin};
 use io_jail::Minijail;
 use kvm::*;
+use remain::sorted;
 use resources::{AddressRanges, SystemAllocator};
 use sync::Mutex;
 use sys_util::{Clock, EventFd, GuestAddress, GuestMemory, GuestMemoryError};
 
+#[sorted]
 #[derive(Debug)]
 pub enum Error {
     CloneEventFd(sys_util::Error),
@@ -121,9 +124,11 @@ pub enum Error {
 }
 
 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, "unable to clone an EventFd: {}", e),
             Cmdline(e) => write!(f, "the given kernel command line was invalid: {}", e),