Appease clippy

aya-rs · Dec 27, 2024 · f79aadf · f79aadf
1 parent b7aeb8b
commit f79aadf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/aya-log-parser/src/lib.rs b/aya-log-parser/src/lib.rs
@@ -130,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-obj/src/btf/relocation.rs b/aya-obj/src/btf/relocation.rs
@@ -1068,7 +1068,7 @@ impl ComputedRelocation {
                     }
                     BtfType::Enum64(en) => {
                         let variant = &en.variants[accessor.index];
-                        (variant.value_high as u64) << 32 | variant.value_low as u64
+                        ((variant.value_high as u64) << 32) | variant.value_low as u64
                     }
                     // candidate selection ensures that rel_kind == local_kind == target_kind
                     _ => unreachable!(),

diff --git a/aya/src/maps/lpm_trie.rs b/aya/src/maps/lpm_trie.rs
@@ -63,7 +63,7 @@ pub struct LpmTrie<T, K, V> {
 /// let ipaddr = Ipv4Addr::new(8,8,8,8);
 /// let key =  Key::new(16, u32::from(ipaddr).to_be());
 /// ```
-#[repr(packed)]
+#[repr(C, packed)]
 pub struct Key<K: Pod> {
     prefix_len: u32,
     data: K,

diff --git a/ebpf/aya-ebpf/src/maps/lpm_trie.rs b/ebpf/aya-ebpf/src/maps/lpm_trie.rs
@@ -18,7 +18,7 @@ pub struct LpmTrie<K, V> {
 
 unsafe impl<K: Sync, V: Sync> Sync for LpmTrie<K, V> {}
 
-#[repr(packed)]
+#[repr(C, packed)]
 pub struct Key<K> {
     /// Represents the number of bits matched against.
     pub prefix_len: u32,

diff --git a/ebpf/aya-ebpf/src/maps/perf/perf_event_array.rs b/ebpf/aya-ebpf/src/maps/perf/perf_event_array.rs
@@ -51,7 +51,7 @@ impl<T> PerfEventArray<T> {
     }
 
     pub fn output_at_index<C: EbpfContext>(&self, ctx: &C, index: u32, data: &T, flags: u32) {
-        let flags = u64::from(flags) << 32 | u64::from(index);
+        let flags = (u64::from(flags) << 32) | u64::from(index);
         unsafe {
             bpf_perf_event_output(
                 ctx.as_ptr(),

diff --git a/ebpf/aya-ebpf/src/maps/perf/perf_event_byte_array.rs b/ebpf/aya-ebpf/src/maps/perf/perf_event_byte_array.rs
@@ -48,7 +48,7 @@ impl PerfEventByteArray {
     }
 
     pub fn output_at_index<C: EbpfContext>(&self, ctx: &C, index: u32, data: &[u8], flags: u32) {
-        let flags = u64::from(flags) << 32 | u64::from(index);
+        let flags = (u64::from(flags) << 32) | u64::from(index);
         unsafe {
             bpf_perf_event_output(
                 ctx.as_ptr(),