From 41706d74e44f2c3589c28a7149beb4db185594f2 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Fri, 27 Dec 2024 05:50:55 -0500
Subject: [PATCH] Narrow clippy allowances

---
 aya-log-parser/src/lib.rs |  6 +++---
 aya/src/sys/mod.rs        | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/aya-log-parser/src/lib.rs b/aya-log-parser/src/lib.rs
index 82217a78..1e760333 100644
--- a/aya-log-parser/src/lib.rs
+++ b/aya-log-parser/src/lib.rs
@@ -1,6 +1,3 @@
-// We implement our own formatter here and we pass literal strings on purpose.
-#![allow(clippy::literal_string_with_formatting_args)]
-
 use std::str;
 
 use aya_log_common::DisplayHint;
@@ -133,6 +130,9 @@ pub fn parse(format_string: &str) -> Result<Vec<Fragment>, String> {
 mod test {
     use super::*;
 
+    // TODO(https://github.com/rust-lang/rust-clippy/issues/13885): narrow this to just the specific
+    // strings when that doesn't trip the lint.
+    #[allow(clippy::literal_string_with_formatting_args)]
     #[test]
     fn test_parse() {
         assert_eq!(
diff --git a/aya/src/sys/mod.rs b/aya/src/sys/mod.rs
index f7b2cc25..86f197ab 100644
--- a/aya/src/sys/mod.rs
+++ b/aya/src/sys/mod.rs
@@ -93,10 +93,6 @@ fn syscall(call: Syscall<'_>) -> SysResult<i64> {
     #[cfg(test)]
     return TEST_SYSCALL.with(|test_impl| unsafe { test_impl.borrow()(call) });
 
-    // The type of integer taken by `ioctl` is different in glibc (i64) and
-    // musl (i32). musl builds would complain about useless conversion.
-    // `libc::ioctl` returns i32 on x86_64 while `libc::syscall` returns i64.
-    #[allow(clippy::useless_conversion)]
     #[cfg_attr(test, allow(unreachable_code))]
     {
         let ret = unsafe {
@@ -112,7 +108,13 @@ fn syscall(call: Syscall<'_>) -> SysResult<i64> {
                     flags,
                 } => libc::syscall(SYS_perf_event_open, &attr, pid, cpu, group, flags),
                 Syscall::PerfEventIoctl { fd, request, arg } => {
-                    let ret = libc::ioctl(fd.as_raw_fd(), request.try_into().unwrap(), arg);
+                    // The type of integer taken by `ioctl` is different in glibc (i64) and
+                    // musl (i32). musl builds would complain about useless conversion.
+                    #[allow(clippy::useless_conversion)]
+                    let request = request.try_into().unwrap();
+                    let ret = libc::ioctl(fd.as_raw_fd(), request, arg);
+                    // `libc::ioctl` returns i32 on x86_64 while `libc::syscall` returns i64.
+                    #[allow(clippy::useless_conversion)]
                     ret.into()
                 }
             }