| commit | fe021ab53e28a11e7bf76854b28388e3a756ad88 | [log] [tgz] |
|---|---|---|
| author | Matthew Maurer <mmaurer@google.com> | Thu Mar 09 17:05:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 17:05:38 2023 +0000 |
| tree | cad62b9bab18d8c1e6cf00eb480de6dd7d3657c3 | |
| parent | f5f2a70de750a937d170099c62dce843a1a142bc [diff] | |
| parent | cc6ae7f488c17685626548f5d5ceae30929fe83e [diff] |
Make remain available to product and vendor am: 5b5c98722e am: c8dec4cae5 am: cc6ae7f488 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/remain/+/2476458 Change-Id: I4cd5752d3fcbb59077708e27cc27642dee3541bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This crate provides an attribute macro to check at compile time that the variants of an enum or the arms of a match expression are written in sorted order.
[dependencies] remain = "0.2"
Place a #[remain::sorted] attribute on enums, structs, match-expressions, or let-statements whose value is a match-expression.
Alternatively, import as use remain::sorted; and use #[sorted] as the attribute.
#[remain::sorted] #[derive(Debug)] pub enum Error { BlockSignal(signal::Error), CreateCrasClient(libcras::Error), CreateEventFd(sys_util::Error), CreateSignalFd(sys_util::SignalFdError), CreateSocket(io::Error), DetectImageType(qcow::Error), DeviceJail(io_jail::Error), NetDeviceNew(virtio::NetError), SpawnVcpu(io::Error), } #[remain::sorted] #[derive(Debug)] pub struct Registers { ax: u16, cx: u16, di: u16, si: u16, sp: u16, } impl Display for Error { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { use self::Error::*; #[remain::sorted] match self { BlockSignal(e) => write!(f, "failed to block signal: {}", e), CreateCrasClient(e) => write!(f, "failed to create cras client: {}", e), CreateEventFd(e) => write!(f, "failed to create eventfd: {}", e), CreateSignalFd(e) => write!(f, "failed to create signalfd: {}", e), CreateSocket(e) => write!(f, "failed to create socket: {}", e), DetectImageType(e) => write!(f, "failed to detect disk image type: {}", e), DeviceJail(e) => write!(f, "failed to jail device: {}", e), NetDeviceNew(e) => write!(f, "failed to set up virtio networking: {}", e), SpawnVcpu(e) => write!(f, "failed to spawn VCPU thread: {}", e), } } }
If an enum variant, struct field, or match arm is inserted out of order,
NetDeviceNew(virtio::NetError), SpawnVcpu(io::Error), + AaaUhOh(Box<dyn StdError>), }
then the macro produces a compile error.
error: AaaUhOh should sort before BlockSignal --> tests/stable.rs:49:5 | 49 | AaaUhOh(Box<dyn StdError>), | ^^^^^^^
The attribute on enums and structs is supported on any rustc version 1.31+.
Rust does not yet have stable support for user-defined attributes within a function body, so the attribute on match-expressions and let-statements requires a nightly compiler and the following two features enabled:
#![feature(proc_macro_hygiene, stmt_expr_attributes)]
As a stable alternative, this crate provides a function-level attribute called #[remain::check] which makes match-expression and let-statement attributes work on any rustc version 1.31+. Place this attribute on any function containing #[sorted] to make them work on a stable compiler.
impl Display for Error { #[remain::check] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { use self::Error::*; #[sorted] match self { /* ... */ } } }