Compare commits

..

No commits in common. 'f635d80708bf013f7092db552bece9804d536a5f' and '727dfcd7eea2520f8e74039f9904a4353fbb3f59' have entirely different histories.

@ -67,7 +67,7 @@ base64 = { version = "0.22.1", default-features = false }
bindgen = { version = "0.72", default-features = false }
bitflags = { version = "2.2.1", default-features = false }
bytes = { version = "1", default-features = false }
cargo_metadata = { version = "0.21.0", default-features = false }
cargo_metadata = { version = "0.20.0", default-features = false }
clap = { version = "4", default-features = false }
const-assert = { version = "1.0.1", default-features = false }
dialoguer = { version = "0.11", default-features = false }
@ -89,7 +89,7 @@ once_cell = { version = "1.20.1", default-features = false }
proc-macro2 = { version = "1", default-features = false }
proc-macro2-diagnostics = { version = "0.10.1", default-features = false }
procfs = { version = "0.17.0", default-features = false }
public-api = { version = "0.49.0", default-features = false }
public-api = { version = "0.48.0", default-features = false }
quote = { version = "1", default-features = false }
rand = { version = "0.9", default-features = false }
rbpf = { version = "0.3.0", default-features = false }

@ -151,7 +151,10 @@ impl<T: Log> EbpfLogger<T> {
.ok_or_else(|| Error::MapNotFound)?
.iter()
.filter_map(|id| MapInfo::from_id(*id).ok())
.find(|map_info| map_info.name_as_str() == Some(MAP_NAME))
.find(|map_info| match map_info.name_as_str() {
Some(name) => name == MAP_NAME,
None => false,
})
.ok_or(Error::MapNotFound)?;
let map = MapData::from_id(map.id())?;
@ -292,7 +295,7 @@ impl Format for u32 {
Some(DisplayHint::Ip) => Ok(Ipv4Formatter::format(*self)),
Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()),
None => Ok(DefaultFormatter::format(self)),
_ => Ok(DefaultFormatter::format(self)),
}
}
}
@ -348,7 +351,7 @@ impl Format for [u8; 6] {
Some(DisplayHint::Ip) => Err(()),
Some(DisplayHint::LowerMac) => Ok(LowerMacFormatter::format(*self)),
Some(DisplayHint::UpperMac) => Ok(UpperMacFormatter::format(*self)),
None => Err(()),
_ => Err(()),
}
}
}
@ -362,7 +365,7 @@ impl Format for [u8; 16] {
Some(DisplayHint::Ip) => Ok(Ipv6Formatter::format(*self)),
Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()),
None => Err(()),
_ => Err(()),
}
}
}
@ -376,7 +379,7 @@ impl Format for [u16; 8] {
Some(DisplayHint::Ip) => Ok(Ipv6Formatter::format(*self)),
Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()),
None => Err(()),
_ => Err(()),
}
}
}
@ -392,7 +395,7 @@ macro_rules! impl_format {
Some(DisplayHint::Ip) => Err(()),
Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()),
None => Ok(DefaultFormatter::format(self)),
_ => Ok(DefaultFormatter::format(self)),
}
}
}
@ -421,7 +424,7 @@ macro_rules! impl_format_float {
Some(DisplayHint::Ip) => Err(()),
Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()),
None => Ok(DefaultFormatter::format(self)),
_ => Ok(DefaultFormatter::format(self)),
}
}
}

Loading…
Cancel
Save