diff --git a/aya-log-common/src/lib.rs b/aya-log-common/src/lib.rs index ce04f210..831c0232 100644 --- a/aya-log-common/src/lib.rs +++ b/aya-log-common/src/lib.rs @@ -43,7 +43,6 @@ macro_rules! impl_formatter_for_types { }; } -// Any value impl `ToString` pub trait DefaultFormatter {} impl_formatter_for_types!( DefaultFormatter: { @@ -61,24 +60,20 @@ pub trait LowerHexFormatter {} impl_formatter_for_types!( LowerHexFormatter: { i8, i16, i32, i64, isize, - u8, u16, u32, u64, usize + u8, u16, u32, u64, usize, + &[u8] } ); -pub trait LowerHexDebugFormatter {} -impl LowerHexDebugFormatter for &[u8] {} - pub trait UpperHexFormatter {} impl_formatter_for_types!( UpperHexFormatter: { i8, i16, i32, i64, isize, - u8, u16, u32, u64, usize + u8, u16, u32, u64, usize, + &[u8] } ); -pub trait UpperHexDebugFormatter {} -impl UpperHexDebugFormatter for &[u8] {} - pub trait Ipv4Formatter {} impl Ipv4Formatter for u32 {} @@ -97,12 +92,8 @@ pub fn check_impl_default(_v: T) {} #[inline(always)] pub fn check_impl_lower_hex(_v: T) {} #[inline(always)] -pub fn check_impl_lower_hex_debug(_v: T) {} -#[inline(always)] pub fn check_impl_upper_hex(_v: T) {} #[inline(always)] -pub fn check_impl_upper_hex_debug(_v: T) {} -#[inline(always)] pub fn check_impl_ipv4(_v: T) {} #[inline(always)] pub fn check_impl_ipv6(_v: T) {} diff --git a/aya-log/src/lib.rs b/aya-log/src/lib.rs index ff88df5c..92d686bb 100644 --- a/aya-log/src/lib.rs +++ b/aya-log/src/lib.rs @@ -126,10 +126,7 @@ impl BpfLogger { #[allow(clippy::needless_range_loop)] for i in 0..events.read { let buf = &mut buffers[i]; - match log_buf(buf, &*log) { - Ok(()) => {} - Err(e) => error!("internal error => {:?}", e), - } + log_buf(buf, &*log).unwrap(); } } });