Skip to content

Commit 0c732c1

Browse files
committed
Rename CFRunLoopMode constructors for clippy::should_implement_trait lint
1 parent 8118d6a commit 0c732c1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

core-foundation/src/filedescriptor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ mod test {
154154
let run_loop = CFRunLoop::get_current();
155155
let source = CFRunLoopSource::from_file_descriptor(&cf_fd, 0);
156156
assert!(source.is_some());
157-
run_loop.add_source(&source.unwrap(), CFRunLoopMode::default());
157+
run_loop.add_source(&source.unwrap(), CFRunLoopMode::default_mode());
158158

159159
info.value = 0;
160160
cf_fd.enable_callbacks(kCFFileDescriptorReadCallBack);

core-foundation/src/runloop.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ impl<'a> CFRunLoopMode<'a> {
2929
}
3030

3131
#[doc(alias = "kCFRunLoopCommonModes")]
32-
pub fn common() -> CFRunLoopMode<'static> {
32+
pub fn common_modes() -> CFRunLoopMode<'static> {
3333
unsafe { CFRunLoopMode(kCFRunLoopCommonModes, PhantomData) }
3434
}
3535

3636
#[doc(alias = "kCFRunLoopDefaultMode")]
37-
pub fn default() -> CFRunLoopMode<'static> {
37+
pub fn default_mode() -> CFRunLoopMode<'static> {
3838
unsafe { CFRunLoopMode(kCFRunLoopDefaultMode, PhantomData) }
3939
}
4040
}
@@ -240,7 +240,7 @@ mod test {
240240

241241
let run_loop_timer =
242242
CFRunLoopTimer::new(now + 0.20f64, 0f64, 0, 0, timer_popped, &mut context);
243-
run_loop.add_timer(&run_loop_timer, CFRunLoopMode::default());
243+
run_loop.add_timer(&run_loop_timer, CFRunLoopMode::default_mode());
244244

245245
CFRunLoop::run_current();
246246
let elapsed = elapsed_rx.try_recv().unwrap();
@@ -294,7 +294,7 @@ mod test {
294294
};
295295

296296
let runloop = CFRunLoop::get_current();
297-
runloop.add_observer(&observer, CFRunLoopMode::default());
297+
runloop.add_observer(&observer, CFRunLoopMode::default_mode());
298298

299299
let timer = CFRunLoopTimer::new(
300300
CFDate::now().abs_time() + 1f64,
@@ -304,10 +304,10 @@ mod test {
304304
observe_timer_popped,
305305
null_mut(),
306306
);
307-
runloop.add_timer(&timer, CFRunLoopMode::default());
307+
runloop.add_timer(&timer, CFRunLoopMode::default_mode());
308308

309309
let result =
310-
CFRunLoop::run_in_mode(CFRunLoopMode::default(), Duration::from_secs(10), false);
310+
CFRunLoop::run_in_mode(CFRunLoopMode::default_mode(), Duration::from_secs(10), false);
311311

312312
assert_eq!(result, CFRunLoopRunResult::Stopped);
313313

core-graphics/src/event.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ unsafe extern "C" fn cg_event_tap_callback_internal(
461461
/// .mach_port
462462
/// .create_runloop_source(0)
463463
/// .expect("Somethings is bad ");
464-
/// current.add_source(&loop_source, CFRunLoopMode::common());
464+
/// current.add_source(&loop_source, CFRunLoopMode::common_modes());
465465
/// tap.enable();
466466
/// CFRunLoop::run_current();
467467
/// },

0 commit comments

Comments
 (0)