From c05e963f3704ebfb456bf309a923af691bae8c7a Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 30 Jan 2025 02:19:30 +0800
Subject: [PATCH] Address clippy warnings

---
 native/src/boot/lib.rs           |  2 +-
 native/src/core/socket.rs        | 40 ++++++++++++++------------------
 native/src/sepolicy/statement.rs |  9 +++----
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/native/src/boot/lib.rs b/native/src/boot/lib.rs
index f90b16e07..54a56ce42 100644
--- a/native/src/boot/lib.rs
+++ b/native/src/boot/lib.rs
@@ -70,5 +70,5 @@ pub mod ffi {
 
 #[inline(always)]
 pub(crate) fn check_env(env: &str) -> bool {
-    env::var(env).map_or(false, |var| var == "true")
+    env::var(env).is_ok_and(|var| var == "true")
 }
diff --git a/native/src/core/socket.rs b/native/src/core/socket.rs
index f61e0664c..d2afb8b06 100644
--- a/native/src/core/socket.rs
+++ b/native/src/core/socket.rs
@@ -32,7 +32,7 @@ impl<T: Read> IpcRead for T {
         let mut val: E = Zeroable::zeroed();
         for _ in 0..len {
             self.read_pod(&mut val)?;
-            vec.push(val.clone());
+            vec.push(val);
         }
         Ok(vec)
     }
@@ -91,21 +91,19 @@ impl UnixSocketExt for UnixStream {
         let mut ancillary = SocketAncillary::new(&mut buf);
         let iov = IoSliceMut::new(bytes_of_mut(&mut fd_count));
         self.recv_vectored_with_ancillary(&mut [iov], &mut ancillary)?;
-        for msg in ancillary.messages() {
-            if let Ok(msg) = msg {
-                if let AncillaryData::ScmRights(mut scm_rights) = msg {
-                    // We only want the first one
-                    let fd = if let Some(fd) = scm_rights.next() {
-                        unsafe { OwnedFd::from_raw_fd(fd) }
-                    } else {
-                        return Ok(None);
-                    };
-                    // Close all others
-                    for fd in scm_rights {
-                        unsafe { libc::close(fd) };
-                    }
-                    return Ok(Some(fd));
+        for msg in ancillary.messages().flatten() {
+            if let AncillaryData::ScmRights(mut scm_rights) = msg {
+                // We only want the first one
+                let fd = if let Some(fd) = scm_rights.next() {
+                    unsafe { OwnedFd::from_raw_fd(fd) }
+                } else {
+                    return Ok(None);
+                };
+                // Close all others
+                for fd in scm_rights {
+                    unsafe { libc::close(fd) };
                 }
+                return Ok(Some(fd));
             }
         }
         Ok(None)
@@ -119,13 +117,11 @@ impl UnixSocketExt for UnixStream {
         let iov = IoSliceMut::new(bytes_of_mut(&mut fd_count));
         self.recv_vectored_with_ancillary(&mut [iov], &mut ancillary)?;
         let mut fds: Vec<OwnedFd> = Vec::new();
-        for msg in ancillary.messages() {
-            if let Ok(msg) = msg {
-                if let AncillaryData::ScmRights(scm_rights) = msg {
-                    fds = scm_rights
-                        .map(|fd| unsafe { OwnedFd::from_raw_fd(fd) })
-                        .collect();
-                }
+        for msg in ancillary.messages().flatten() {
+            if let AncillaryData::ScmRights(scm_rights) = msg {
+                fds = scm_rights
+                    .map(|fd| unsafe { OwnedFd::from_raw_fd(fd) })
+                    .collect();
             }
         }
         if fd_count as usize != fds.len() {
diff --git a/native/src/sepolicy/statement.rs b/native/src/sepolicy/statement.rs
index 6e5784ac8..6c2dd2223 100644
--- a/native/src/sepolicy/statement.rs
+++ b/native/src/sepolicy/statement.rs
@@ -201,13 +201,10 @@ fn parse_xperms<'a>(tokens: &mut Tokens<'a>) -> ParseResult<'a, Vec<Xperm>> {
 }
 
 fn match_string<'a>(tokens: &mut Tokens<'a>, pattern: &str) -> ParseResult<'a, ()> {
-    match tokens.next() {
-        Some(Token::ID(s)) => {
-            if s == pattern {
-                return Ok(());
-            }
+    if let Some(Token::ID(s)) = tokens.next() {
+        if s == pattern {
+            return Ok(());
         }
-        _ => {}
     }
     Err(ParseError::General)
 }