clippy: Fix latest nightly lints

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
pull/336/head
Dave Tucker 2 years ago
parent 323170aa3f
commit 336faf553e

@ -150,7 +150,7 @@ mod test {
use super::{combine_flags, extract_ctypes_prefix};
fn to_vec(s: &str) -> Vec<String> {
s.split(" ").map(|x| x.into()).collect()
s.split(' ').map(|x| x.into()).collect()
}
#[test]

@ -62,7 +62,7 @@ impl Deref for MapRef {
type Target = Map;
fn deref(&self) -> &Map {
&*self.guard
&self.guard
}
}
@ -70,12 +70,12 @@ impl Deref for MapRefMut {
type Target = Map;
fn deref(&self) -> &Map {
&*self.guard
&self.guard
}
}
impl DerefMut for MapRefMut {
fn deref_mut(&mut self) -> &mut Map {
&mut *self.guard
&mut self.guard
}
}

@ -602,8 +602,8 @@ pub(crate) fn fields_are_compatible(
let flavorless_name =
|name: &str| name.split_once("___").map_or(name, |x| x.0).to_string();
let local_name = flavorless_name(&*local_btf.type_name(local_ty)?.unwrap());
let target_name = flavorless_name(&*target_btf.type_name(target_ty)?.unwrap());
let local_name = flavorless_name(&local_btf.type_name(local_ty)?.unwrap());
let target_name = flavorless_name(&target_btf.type_name(target_ty)?.unwrap());
return Ok(local_name == target_name);
}

@ -635,21 +635,13 @@ impl Object {
let section_size_bytes = sym.size as u32 / INS_SIZE as u32;
let mut func_info = btf_ext.func_info.get(section.name);
func_info.func_info = func_info
.func_info
.into_iter()
.filter(|f| f.insn_off == bytes_offset)
.collect();
func_info.func_info.retain(|f| f.insn_off == bytes_offset);
let mut line_info = btf_ext.line_info.get(section.name);
line_info.line_info = line_info
.line_info
.into_iter()
.filter(|l| {
l.insn_off >= bytes_offset
&& l.insn_off < (bytes_offset + section_size_bytes) as u32
})
.collect();
line_info.line_info.retain(|l| {
l.insn_off >= bytes_offset
&& l.insn_off < (bytes_offset + section_size_bytes) as u32
});
(
func_info,
@ -1401,7 +1393,7 @@ mod tests {
assert!(obj.maps.get("foo").is_some());
assert!(obj.maps.get("bar").is_some());
assert!(obj.maps.get("baz").is_some());
for (_, m) in &obj.maps {
for m in obj.maps.values() {
assert_eq!(&m.def, def);
}
}

Loading…
Cancel
Save