Skip to content

Commit

Permalink
style: make clippy happy
Browse files Browse the repository at this point in the history
  • Loading branch information
morrisonlevi committed Jun 19, 2024
1 parent 6e632f9 commit fb2ae5e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions profiling/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const ZAI_H_FILES: &[&str] = &[
"../zend_abstract_interface/json/json.h",
];

#[allow(clippy::too_many_arguments)]
fn build_zend_php_ffis(
php_config_includes: &str,
post_startup_cb: bool,
Expand Down
6 changes: 2 additions & 4 deletions profiling/src/wall_time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use crate::bindings::{
};
use crate::{zend, PROFILER, REQUEST_LOCALS};
use std::mem::MaybeUninit;
use std::ptr;
use std::sync::atomic::Ordering;

/// The engine's previous [zend::zend_execute_internal] value, or
Expand Down Expand Up @@ -62,7 +61,7 @@ pub extern "C" fn ddog_php_prof_interrupt_function(execute_data: *mut zend_execu
{
let current_execute_data_cache = locals
.current_execute_data_cache
.swap(ptr::null_mut(), Ordering::SeqCst);
.swap(core::ptr::null_mut(), Ordering::SeqCst);
let vm_stack_top_addr = locals.executor_global_addrs.vm_stack_top.as_ptr();

// The engine stores a zend_execute_data* in vm_stack_top even
Expand Down Expand Up @@ -154,8 +153,7 @@ pub unsafe fn minit() {
};
zend_interrupt_function = Some(function);

#[cfg(not(php_good_closure_invoke))]
{
if !cfg!(php_good_closure_invoke) {
PREV_EXECUTE_INTERNAL.write(zend_execute_internal.unwrap_or(zend::execute_internal));
zend_execute_internal = Some(execute_internal);
}
Expand Down

0 comments on commit fb2ae5e

Please sign in to comment.