Skip to content

Commit 4fcc05c

Browse files
committed
Wrap unsafe calls in unsafe {}
1 parent 8370ad2 commit 4fcc05c

File tree

1 file changed

+36
-29
lines changed

1 file changed

+36
-29
lines changed

system-configuration/src/network_reachability.rs

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,15 @@ mod test {
393393
addr
394394
);
395395
reachability.set_callback(|_| {}).unwrap();
396-
reachability
397-
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe { kCFRunLoopCommonModes })
398-
.unwrap();
399-
reachability
400-
.unschedule_from_runloop(&CFRunLoop::get_current(), unsafe {
401-
kCFRunLoopCommonModes
402-
})
403-
.unwrap();
396+
// SAFETY: We use the Apple provided run_loop_mode kCFRunLoopCommonModes
397+
unsafe {
398+
reachability
399+
.schedule_with_runloop(&CFRunLoop::get_current(), kCFRunLoopCommonModes)
400+
.unwrap();
401+
reachability
402+
.unschedule_from_runloop(&CFRunLoop::get_current(), kCFRunLoopCommonModes)
403+
.unwrap();
404+
}
404405
}
405406
}
406407

@@ -424,14 +425,15 @@ mod test {
424425
remote
425426
);
426427
reachability.set_callback(|_| {}).unwrap();
427-
reachability
428-
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe { kCFRunLoopCommonModes })
429-
.unwrap();
430-
reachability
431-
.unschedule_from_runloop(&CFRunLoop::get_current(), unsafe {
432-
kCFRunLoopCommonModes
433-
})
434-
.unwrap();
428+
// SAFETY: We use the Apple provided run_loop_mode kCFRunLoopCommonModes
429+
unsafe {
430+
reachability
431+
.schedule_with_runloop(&CFRunLoop::get_current(), kCFRunLoopCommonModes)
432+
.unwrap();
433+
reachability
434+
.unschedule_from_runloop(&CFRunLoop::get_current(), kCFRunLoopCommonModes)
435+
.unwrap();
436+
}
435437
}
436438
}
437439

@@ -445,16 +447,18 @@ mod test {
445447
match SCNetworkReachability::from_host(&input) {
446448
Some(mut reachability) => {
447449
reachability.set_callback(|_| {}).unwrap();
448-
reachability
449-
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe {
450-
kCFRunLoopCommonModes
451-
})
452-
.unwrap();
453-
reachability
454-
.unschedule_from_runloop(&CFRunLoop::get_current(), unsafe {
455-
kCFRunLoopCommonModes
456-
})
457-
.unwrap();
450+
// SAFETY: We use the Apple provided run_loop_mode kCFRunLoopCommonModes
451+
unsafe {
452+
reachability
453+
.schedule_with_runloop(&CFRunLoop::get_current(), kCFRunLoopCommonModes)
454+
.unwrap();
455+
reachability
456+
.unschedule_from_runloop(
457+
&CFRunLoop::get_current(),
458+
kCFRunLoopCommonModes,
459+
)
460+
.unwrap();
461+
}
458462
}
459463
None => {
460464
panic!(
@@ -481,9 +485,12 @@ mod test {
481485
let mut reachability =
482486
SCNetworkReachability::from("0.0.0.0:0".parse::<SocketAddr>().unwrap());
483487
reachability.set_callback(|_| {}).unwrap();
484-
reachability
485-
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe { kCFRunLoopCommonModes })
486-
.unwrap();
488+
// SAFETY: We use the Apple provided run_loop_mode kCFRunLoopCommonModes
489+
unsafe {
490+
reachability
491+
.schedule_with_runloop(&CFRunLoop::get_current(), kCFRunLoopCommonModes)
492+
.unwrap();
493+
}
487494
reachability.set_callback(|_| {}).unwrap();
488495
let _ = tx.send(reachability);
489496
CFRunLoop::run_current();

0 commit comments

Comments
 (0)