diff --git a/aya-ebpf-macros/src/uprobe.rs b/aya-ebpf-macros/src/uprobe.rs index 290dda33..bc748635 100644 --- a/aya-ebpf-macros/src/uprobe.rs +++ b/aya-ebpf-macros/src/uprobe.rs @@ -89,7 +89,7 @@ impl UProbe { .ok_or(item.sig.span().error("expected `function` attribute"))?; match offset { None => format!("{prefix}/{path}:{function}").into(), - Some(offset) => format!("{prefix}/{path}:{function}+{offset}",).into(), + Some(offset) => format!("{prefix}/{path}:{function}+{offset}").into(), } } }; diff --git a/aya-obj/src/obj.rs b/aya-obj/src/obj.rs index a8dd5501..ece738ef 100644 --- a/aya-obj/src/obj.rs +++ b/aya-obj/src/obj.rs @@ -1662,7 +1662,7 @@ mod tests { "kprobe/foo", &42u32.to_ne_bytes(), None, - ),), + )), Err(ParseError::InvalidProgramCode) ); } diff --git a/aya-tool/src/generate.rs b/aya-tool/src/generate.rs index 25d393a5..2a5b0993 100644 --- a/aya-tool/src/generate.rs +++ b/aya-tool/src/generate.rs @@ -174,32 +174,32 @@ mod test { #[test] fn test_combine_flags() { assert_eq!( - combine_flags(&to_vec("a b"), &to_vec("c d"),).join(" "), + combine_flags(&to_vec("a b"), &to_vec("c d")).join(" "), "a b c d", ); assert_eq!( - combine_flags(&to_vec("a -- b"), &to_vec("a b"),).join(" "), + combine_flags(&to_vec("a -- b"), &to_vec("a b")).join(" "), "a a b -- b", ); assert_eq!( - combine_flags(&to_vec("a -- b"), &to_vec("c d"),).join(" "), + combine_flags(&to_vec("a -- b"), &to_vec("c d")).join(" "), "a c d -- b", ); assert_eq!( - combine_flags(&to_vec("a b"), &to_vec("c -- d"),).join(" "), + combine_flags(&to_vec("a b"), &to_vec("c -- d")).join(" "), "a b c -- d", ); assert_eq!( - combine_flags(&to_vec("a -- b"), &to_vec("c -- d"),).join(" "), + combine_flags(&to_vec("a -- b"), &to_vec("c -- d")).join(" "), "a c -- b d", ); assert_eq!( - combine_flags(&to_vec("a -- b"), &to_vec("-- c d"),).join(" "), + combine_flags(&to_vec("a -- b"), &to_vec("-- c d")).join(" "), "a -- b c d", ); } diff --git a/aya/src/programs/probe.rs b/aya/src/programs/probe.rs index 2059c2e8..9f6eea90 100644 --- a/aya/src/programs/probe.rs +++ b/aya/src/programs/probe.rs @@ -251,7 +251,7 @@ fn create_probe_event( .unwrap(); let mut probe = OsString::new(); - write!(&mut probe, "{}:{}s/", probe_type_prefix, kind.pmu(),).unwrap(); + write!(&mut probe, "{}:{}s/", probe_type_prefix, kind.pmu()).unwrap(); probe.push(&event_alias); probe.push(" "); probe.push(fn_name); diff --git a/test/integration-test/src/tests/ring_buf.rs b/test/integration-test/src/tests/ring_buf.rs index f77e8e9d..4089bcbe 100644 --- a/test/integration-test/src/tests/ring_buf.rs +++ b/test/integration-test/src/tests/ring_buf.rs @@ -234,7 +234,7 @@ async fn ring_buf_async_with_drops() { "seen={seen}, rejected={rejected}, dropped={dropped}, total={total}, max_seen={max_seen}, \ max_rejected={max_rejected}, max_dropped={max_dropped}", ); - assert_eq!(seen + rejected + dropped, total, "{facts}",); + assert_eq!(seen + rejected + dropped, total, "{facts}"); assert!( (0u64..=max_dropped).contains(&dropped), "dropped={dropped} not in 0..={max_dropped}; {facts}",