style(profiling): remove needless borrows and redundant static lifetimes

morrisonlevi · morrisonlevi · commit 8d86c8d3097b · 2026-06-17T16:49:15.000-06:00
diff --git a/profiling/src/allocation/allocation_ge84.rs b/profiling/src/allocation/allocation_ge84.rs
@@ -327,7 +327,7 @@ unsafe fn alloc_prof_prev_alloc(len: size_t) -> *mut c_void {
     let alloc = tls_zend_mm_state_get!(prev_custom_mm_alloc).unwrap();
     #[cfg(php_debug)]
     {
-        return alloc(len, ptr::null(), 0, ptr::null(), 0);
+        alloc(len, ptr::null(), 0, ptr::null(), 0)
     }
     #[cfg(not(php_debug))]
     alloc(len)
@@ -407,7 +407,7 @@ unsafe fn alloc_prof_prev_free(ptr: *mut c_void) {
     let free = tls_zend_mm_state_get!(prev_custom_mm_free).unwrap();
     #[cfg(php_debug)]
     {
-        return free(ptr, core::ptr::null(), 0, core::ptr::null(), 0);
+        free(ptr, core::ptr::null(), 0, core::ptr::null(), 0)
     }
     #[cfg(not(php_debug))]
     free(ptr)
@@ -530,7 +530,7 @@ unsafe fn alloc_prof_prev_realloc(prev_ptr: *mut c_void, len: size_t) -> *mut c_
     let realloc = tls_zend_mm_state_get!(prev_custom_mm_realloc).unwrap();
     #[cfg(php_debug)]
     {
-        return realloc(prev_ptr, len, ptr::null(), 0, ptr::null(), 0);
+        realloc(prev_ptr, len, ptr::null(), 0, ptr::null(), 0)
     }
     #[cfg(not(php_debug))]
     realloc(prev_ptr, len)
diff --git a/profiling/src/lib.rs b/profiling/src/lib.rs
@@ -53,7 +53,7 @@ use uuid::Uuid;
 static PROFILER_NAME: &CStr = c"datadog-profiling";
 
 // SAFETY: PROFILER_NAME is a valid utf8 string.
-static PROFILER_NAME_STR: &'static str = match PROFILER_NAME.to_str() {
+static PROFILER_NAME_STR: &str = match PROFILER_NAME.to_str() {
     Ok(s) => s,
     // Panic: we own this string and it should be UTF8 (see PROFILER_NAME above).
     Err(_) => panic!(""),
@@ -64,7 +64,7 @@ static PROFILER_NAME_STR: &'static str = match PROFILER_NAME.to_str() {
 static PROFILER_VERSION: &[u8] = concat!(env!("PROFILER_VERSION"), "\0").as_bytes();
 
 // SAFETY: PROFILER_VERSION is a byte slice that satisfies the safety requirements.
-static PROFILER_VERSION_STR: &'static str = const {
+static PROFILER_VERSION_STR: &str = const {
     match unsafe { CStr::from_ptr(PROFILER_VERSION.as_ptr() as *const c_char).to_str() } {
         Ok(v) => v,
         // Panic: we own this string and it should be UTF8 (see PROFILER_VERSION above).
diff --git a/profiling/src/profiling/uploader.rs b/profiling/src/profiling/uploader.rs
@@ -107,15 +107,13 @@ impl Uploader {
         let index = Arc::unwrap_or_clone(message.index);
         let profile = message.profile;
 
-        let profiling_library_name: &str = &PROFILER_NAME_STR;
-        let profiling_library_version: &str = &PROFILER_VERSION_STR;
         let agent_endpoint = &self.endpoint;
         let endpoint = Endpoint::try_from(agent_endpoint)?;
 
         let tags = Arc::unwrap_or_clone(index.tags);
         let mut exporter = libdd_profiling::exporter::ProfileExporter::new(
-            profiling_library_name,
-            profiling_library_version,
+            PROFILER_NAME_STR,
+            PROFILER_VERSION_STR,
             "php",
             tags,
             endpoint,

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ unsafe fn alloc_prof_prev_alloc(len: size_t) -> *mut c_void {`
`327`	`327`	`let alloc = tls_zend_mm_state_get!(prev_custom_mm_alloc).unwrap();`
`328`	`328`	`#[cfg(php_debug)]`
`329`	`329`	`{`
`330`		`- return alloc(len, ptr::null(), 0, ptr::null(), 0);`
	`330`	`+ alloc(len, ptr::null(), 0, ptr::null(), 0)`
`331`	`331`	`}`
`332`	`332`	`#[cfg(not(php_debug))]`
`333`	`333`	`alloc(len)`
`@@ -407,7 +407,7 @@ unsafe fn alloc_prof_prev_free(ptr: *mut c_void) {`
`407`	`407`	`let free = tls_zend_mm_state_get!(prev_custom_mm_free).unwrap();`
`408`	`408`	`#[cfg(php_debug)]`
`409`	`409`	`{`
`410`		`- return free(ptr, core::ptr::null(), 0, core::ptr::null(), 0);`
	`410`	`+ free(ptr, core::ptr::null(), 0, core::ptr::null(), 0)`
`411`	`411`	`}`
`412`	`412`	`#[cfg(not(php_debug))]`
`413`	`413`	`free(ptr)`
`@@ -530,7 +530,7 @@ unsafe fn alloc_prof_prev_realloc(prev_ptr: mut c_void, len: size_t) -> mut c_`
`530`	`530`	`let realloc = tls_zend_mm_state_get!(prev_custom_mm_realloc).unwrap();`
`531`	`531`	`#[cfg(php_debug)]`
`532`	`532`	`{`
`533`		`- return realloc(prev_ptr, len, ptr::null(), 0, ptr::null(), 0);`
	`533`	`+ realloc(prev_ptr, len, ptr::null(), 0, ptr::null(), 0)`
`534`	`534`	`}`
`535`	`535`	`#[cfg(not(php_debug))]`
`536`	`536`	`realloc(prev_ptr, len)`