From 8dc33d035a3bac4c12bd60ef64db3eb90ee666f8 Mon Sep 17 00:00:00 2001 From: tiann Date: Mon, 27 Mar 2023 15:44:18 +0800 Subject: [PATCH] ksud: fix clippy --- userspace/ksud/src/sepolicy.rs | 9 ++------- userspace/ksud/src/utils.rs | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/userspace/ksud/src/sepolicy.rs b/userspace/ksud/src/sepolicy.rs index 73da471e..777c9b67 100644 --- a/userspace/ksud/src/sepolicy.rs +++ b/userspace/ksud/src/sepolicy.rs @@ -376,19 +376,14 @@ const CMD_TYPE_TRANSITION: u32 = 7; const CMD_TYPE_CHANGE: u32 = 8; const CMD_GENFSCON: u32 = 9; -#[derive(Debug)] +#[derive(Debug, Default)] enum PolicyObject { All, // for "*", stand for all objects, and is NULL in ffi One([u8; SEPOLICY_MAX_LEN]), + #[default] None, } -impl Default for PolicyObject { - fn default() -> Self { - PolicyObject::None - } -} - impl TryFrom<&str> for PolicyObject { type Error = anyhow::Error; fn try_from(s: &str) -> Result { diff --git a/userspace/ksud/src/utils.rs b/userspace/ksud/src/utils.rs index a27345d7..a6231254 100644 --- a/userspace/ksud/src/utils.rs +++ b/userspace/ksud/src/utils.rs @@ -101,7 +101,7 @@ pub fn get_zip_uncompressed_size(zip_path: &str) -> Result { pub fn switch_mnt_ns(pid: i32) -> Result<()> { use anyhow::ensure; use std::os::fd::AsRawFd; - let path = format!("/proc/{}/ns/mnt", pid); + let path = format!("/proc/{pid}/ns/mnt"); let fd = std::fs::File::open(path)?; let ret = unsafe { libc::setns(fd.as_raw_fd(), libc::CLONE_NEWNS) }; ensure!(ret == 0, "switch mnt ns failed");