Automatically handle some Dispatch CStr conversions

Author: madsmtm

crates/dispatch2/src/queue.rs

@@ -73,8 +73,7 @@ impl DispatchQueue {
     pub fn new(label: &str, queue_attribute: Option<&DispatchQueueAttr>) -> DispatchRetained<Self> {
         let label = CString::new(label).expect("Invalid label!");
 
-        // SAFETY: The label is a valid C string.
-        unsafe { Self::__new(label.as_ptr(), queue_attribute) }
+        Self::__new(Some(&label), queue_attribute)
     }
 
     /// Create a new [`DispatchQueue`] with a given target [`DispatchQueue`].
@@ -85,8 +84,8 @@ impl DispatchQueue {
     ) -> DispatchRetained<Self> {
         let label = CString::new(label).expect("Invalid label!");
 
-        // SAFETY: The label is a valid C string.
-        unsafe { Self::__new_with_target(label.as_ptr(), queue_attribute, target) }
+        // SAFETY: `target` queue TODO.
+        unsafe { Self::__new_with_target(Some(&label), queue_attribute, target) }
     }
 
     /// Return a system-defined global concurrent [`DispatchQueue`] with the priority derived from [GlobalQueueIdentifier].

crates/dispatch2/src/workloop.rs

@@ -17,13 +17,10 @@ impl DispatchWorkloop {
     pub fn new(label: &str, inactive: bool) -> DispatchRetained<Self> {
         let label = CString::new(label).expect("Invalid label!");
 
-        // Safety: label can only be valid.
-        unsafe {
-            if inactive {
-                DispatchWorkloop::__new_inactive(label.as_ptr())
-            } else {
-                DispatchWorkloop::__new(label.as_ptr())
-            }
+        if inactive {
+            DispatchWorkloop::__new_inactive(Some(&label))
+        } else {
+            DispatchWorkloop::__new(Some(&label))
         }
     }
 }

crates/dispatch2/translation-config.toml

@@ -228,6 +228,11 @@ fn.dispatch_queue_create_with_target.renamed = "__new_with_target"
 fn.dispatch_workloop_create.renamed = "__new"
 fn.dispatch_workloop_create_inactive.renamed = "__new_inactive"
 
+fn.dispatch_queue_create.arguments.0.bounds = "null-terminated"
+fn.dispatch_queue_create_with_target.arguments.0.bounds = "null-terminated"
+fn.dispatch_workloop_create.arguments.0.bounds = "null-terminated"
+fn.dispatch_workloop_create_inactive.arguments.0.bounds = "null-terminated"
+
 ##
 ## Safety + API
 ##