commit | a0706bc94aef63f43ec87636cf60a9ead0cf1b7c | [log] [tgz] |
---|---|---|
author | Jeff Vander Stoep <jeffv@google.com> | Tue Feb 13 11:54:34 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 13 11:54:34 2024 +0000 |
tree | db0d00d58044a7a4e061c87b603310642e894efe | |
parent | 5cc33d0c9791071740dc9c708ceb01bfcd8d0e36 [diff] | |
parent | f4f0115e22332b0c320c85d466d516532f4ca92a [diff] |
Upgrade remain to 0.2.12 am: f4f0115e22 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/remain/+/2953097 Change-Id: I09f8730a2c022b36db0c1da5a28c29424d44e3d0 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 { /* ... */ } } }