Browse Source

Merge pull request #865 from tamird/appease-lint

aya: appease new nightly clippy lints
Tamir Duberstein 1 year ago
parent
commit
09851a2090
2 changed files with 2 additions and 2 deletions
  1. 1 1
      aya/src/bpf.rs
  2. 1 1
      aya/src/sys/fake.rs

+ 1 - 1
aya/src/bpf.rs

@@ -533,7 +533,7 @@ impl<'a> BpfLoader<'a> {
                 let section = prog_obj.section.clone();
                 let obj = (prog_obj, function_obj);
 
-                let btf_fd = btf_fd.as_ref().map(Arc::clone);
+                let btf_fd = btf_fd.clone();
                 let program = if extensions.contains(name.as_str()) {
                     Program::Extension(Extension {
                         data: ProgramData::new(prog_name, obj, btf_fd, *verifier_log_level),

+ 1 - 1
aya/src/sys/fake.rs

@@ -11,7 +11,7 @@ type SyscallFn = unsafe fn(Syscall<'_>) -> SysResult<c_long>;
 #[cfg(test)]
 thread_local! {
     pub(crate) static TEST_SYSCALL: RefCell<SyscallFn> = RefCell::new(test_syscall);
-    pub(crate) static TEST_MMAP_RET: RefCell<*mut c_void> = RefCell::new(ptr::null_mut());
+    pub(crate) static TEST_MMAP_RET: RefCell<*mut c_void> = const { RefCell::new(ptr::null_mut()) };
 }
 
 #[cfg(test)]