Skip to content

Commit ba44fd5

Browse files
shaqqdanobi
authored andcommitted
Fix clippy warnings
1 parent 8462373 commit ba44fd5

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

libbpf-cargo/src/btf/btf.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ pub struct Btf<'a> {
2222
impl<'a> Btf<'a> {
2323
pub fn new(name: &str, object_file: &[u8]) -> Result<Option<Self>> {
2424
let cname = CString::new(name)?;
25-
let mut obj_opts = libbpf_sys::bpf_object_open_opts::default();
26-
obj_opts.sz = std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t;
27-
obj_opts.object_name = cname.as_ptr();
25+
let obj_opts = libbpf_sys::bpf_object_open_opts {
26+
sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t,
27+
object_name: cname.as_ptr(),
28+
..Default::default()
29+
};
30+
2831
let bpf_obj = unsafe {
2932
libbpf_sys::bpf_object__open_mem(
3033
object_file.as_ptr() as *const c_void,

libbpf-cargo/src/gen.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -538,9 +538,12 @@ fn gen_skel_link_getter(
538538

539539
fn open_bpf_object(name: &str, data: &[u8]) -> Result<*mut libbpf_sys::bpf_object> {
540540
let cname = CString::new(name)?;
541-
let mut obj_opts = libbpf_sys::bpf_object_open_opts::default();
542-
obj_opts.sz = std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t;
543-
obj_opts.object_name = cname.as_ptr();
541+
let obj_opts = libbpf_sys::bpf_object_open_opts {
542+
sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t,
543+
object_name: cname.as_ptr(),
544+
..Default::default()
545+
};
546+
544547
let object = unsafe {
545548
libbpf_sys::bpf_object__open_mem(
546549
data.as_ptr() as *const c_void,

libbpf-cargo/src/metadata.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use std::fs;
2+
use std::path::Path;
23
use std::path::PathBuf;
34

45
use anyhow::{bail, Result};
@@ -33,7 +34,7 @@ pub struct UnprocessedObj {
3334
fn get_package(
3435
debug: bool,
3536
package: &Package,
36-
workspace_target_dir: &PathBuf,
37+
workspace_target_dir: &Path,
3738
) -> Result<Vec<UnprocessedObj>> {
3839
if debug {
3940
println!("Metadata for package={}", package.name);
@@ -65,7 +66,7 @@ fn get_package(
6566
};
6667

6768
// Respect custom target directories specified by package
68-
let mut target_dir = workspace_target_dir.clone();
69+
let mut target_dir = workspace_target_dir.to_path_buf();
6970
let out_dir = if let Some(d) = package_metadata.target_dir {
7071
if debug {
7172
println!("Custom target_dir={}", d.to_string_lossy());

libbpf-rs/src/skeleton.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ impl<'a> ObjectSkeletonConfigBuilder<'a> {
165165
// Holds `CString`s alive so pointers to them stay valid
166166
let mut string_pool = Vec::new();
167167

168-
// NB: use default() to zero out struct
169-
let mut s = bpf_object_skeleton::default();
170-
171-
s.sz = size_of::<bpf_object_skeleton>() as u64;
168+
let mut s = libbpf_sys::bpf_object_skeleton {
169+
sz: size_of::<bpf_object_skeleton>() as u64,
170+
..Default::default()
171+
};
172172

173173
if let Some(ref n) = self.name {
174174
s.name = str_to_cstring_and_pool(&n, &mut string_pool)?;

0 commit comments

Comments
 (0)