Skip to content

Commit c2c7fa2

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

File tree

1 file changed

+47
-29
lines changed

1 file changed

+47
-29
lines changed

system-configuration/src/network_reachability.rs

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,19 @@ 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(), unsafe {
400+
kCFRunLoopCommonModes
401+
})
402+
.unwrap();
403+
reachability
404+
.unschedule_from_runloop(&CFRunLoop::get_current(), unsafe {
405+
kCFRunLoopCommonModes
406+
})
407+
.unwrap();
408+
}
404409
}
405410
}
406411

@@ -424,14 +429,19 @@ mod test {
424429
remote
425430
);
426431
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();
432+
// SAFETY: We use the Apple provided run_loop_mode kCFRunLoopCommonModes
433+
unsafe {
434+
reachability
435+
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe {
436+
kCFRunLoopCommonModes
437+
})
438+
.unwrap();
439+
reachability
440+
.unschedule_from_runloop(&CFRunLoop::get_current(), unsafe {
441+
kCFRunLoopCommonModes
442+
})
443+
.unwrap();
444+
}
435445
}
436446
}
437447

@@ -445,16 +455,19 @@ mod test {
445455
match SCNetworkReachability::from_host(&input) {
446456
Some(mut reachability) => {
447457
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();
458+
// SAFETY: We use the Apple provided run_loop_mode kCFRunLoopCommonModes
459+
unsafe {
460+
reachability
461+
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe {
462+
kCFRunLoopCommonModes
463+
})
464+
.unwrap();
465+
reachability
466+
.unschedule_from_runloop(&CFRunLoop::get_current(), unsafe {
467+
kCFRunLoopCommonModes
468+
})
469+
.unwrap();
470+
}
458471
}
459472
None => {
460473
panic!(
@@ -481,9 +494,14 @@ mod test {
481494
let mut reachability =
482495
SCNetworkReachability::from("0.0.0.0:0".parse::<SocketAddr>().unwrap());
483496
reachability.set_callback(|_| {}).unwrap();
484-
reachability
485-
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe { kCFRunLoopCommonModes })
486-
.unwrap();
497+
// SAFETY: We use the Apple provided run_loop_mode kCFRunLoopCommonModes
498+
unsafe {
499+
reachability
500+
.schedule_with_runloop(&CFRunLoop::get_current(), unsafe {
501+
kCFRunLoopCommonModes
502+
})
503+
.unwrap();
504+
}
487505
reachability.set_callback(|_| {}).unwrap();
488506
let _ = tx.send(reachability);
489507
CFRunLoop::run_current();

0 commit comments

Comments
 (0)