summary refs log tree commit diff
diff options
context:
space:
mode:
authorChirantan Ekbote <chirantan@chromium.org>2020-05-25 18:30:24 +0900
committerCommit Bot <commit-bot@chromium.org>2020-06-04 06:09:30 +0000
commite618bf7ec514aaf4d76fd83319a97c7ab9796035 (patch)
tree25fddeec159763c1bbdefdd112266567b643cd67
parent5f1a64892b714885f6c7405084a390467c03201a (diff)
downloadcrosvm-e618bf7ec514aaf4d76fd83319a97c7ab9796035.tar
crosvm-e618bf7ec514aaf4d76fd83319a97c7ab9796035.tar.gz
crosvm-e618bf7ec514aaf4d76fd83319a97c7ab9796035.tar.bz2
crosvm-e618bf7ec514aaf4d76fd83319a97c7ab9796035.tar.lz
crosvm-e618bf7ec514aaf4d76fd83319a97c7ab9796035.tar.xz
crosvm-e618bf7ec514aaf4d76fd83319a97c7ab9796035.tar.zst
crosvm-e618bf7ec514aaf4d76fd83319a97c7ab9796035.zip
sys_util: Make ioctl number method a const fn
This allows us to define const variables that are the return value of
the method, which we can then use in match statements.

BUG=b:157189438
TEST=unit tests

Change-Id: I2475c59bfd43ec9ec149a6b688bf680fa2361a0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2214962
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
-rw-r--r--sys_util/src/ioctl.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys_util/src/ioctl.rs b/sys_util/src/ioctl.rs
index f8c7604..3cf622b 100644
--- a/sys_util/src/ioctl.rs
+++ b/sys_util/src/ioctl.rs
@@ -23,13 +23,13 @@ macro_rules! ioctl_expr {
 macro_rules! ioctl_ioc_nr {
     ($name:ident, $dir:expr, $ty:expr, $nr:expr, $size:expr) => {
         #[allow(non_snake_case)]
-        pub fn $name() -> ::std::os::raw::c_ulong {
+        pub const fn $name() -> ::std::os::raw::c_ulong {
             $crate::ioctl_expr!($dir, $ty, $nr, $size)
         }
     };
     ($name:ident, $dir:expr, $ty:expr, $nr:expr, $size:expr, $($v:ident),+) => {
         #[allow(non_snake_case)]
-        pub fn $name($($v: ::std::os::raw::c_uint),+) -> ::std::os::raw::c_ulong {
+        pub const fn $name($($v: ::std::os::raw::c_uint),+) -> ::std::os::raw::c_ulong {
             $crate::ioctl_expr!($dir, $ty, $nr, $size)
         }
     };