Skip to content

Commit 6c79e1e

Browse files
author
xarvic
committed
make clippy happy
(i hope)
1 parent d5116de commit 6c79e1e

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

druid/src/tests/mod.rs

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -445,45 +445,47 @@ fn resign_focus_on_disable() {
445445
const CHANGE_DISABLED: Selector<bool> = Selector::new("druid-tests.change-disabled-disable");
446446
const REQUEST_FOCUS: Selector<()> = Selector::new("druid-tests.change-disabled-focus");
447447

448-
let test_widget_factory = |auto_focus: bool, id: WidgetId, inner: Option<Box<dyn Widget<()>>>| {
449-
ModularWidget::new(inner.map(|widget|WidgetPod::new(widget)))
450-
.lifecycle_fn(move |state, ctx, event, data, env| {
451-
match event {
452-
LifeCycle::WidgetAdded => {
448+
let test_widget_factory =
449+
|auto_focus: bool, id: WidgetId, inner: Option<Box<dyn Widget<()>>>| {
450+
ModularWidget::new(inner.map(WidgetPod::new))
451+
.lifecycle_fn(move |state, ctx, event, data, env| {
452+
if let LifeCycle::WidgetAdded = event {
453453
if auto_focus {
454454
ctx.register_for_focus();
455455
}
456456
}
457-
_ => {}
458-
}
459-
if let Some(inner) = state {
460-
inner.lifecycle(ctx, event, data, env);
461-
}
462-
})
463-
.event_fn(|state, ctx, event, data, env| {
464-
if let Event::Command(cmd) = event {
465-
if let Some(disabled) = cmd.get(CHANGE_DISABLED) {
466-
ctx.set_disabled(*disabled);
467-
return;
457+
if let Some(inner) = state {
458+
inner.lifecycle(ctx, event, data, env);
468459
}
469-
if cmd.is(REQUEST_FOCUS) {
470-
ctx.request_focus();
471-
return;
460+
})
461+
.event_fn(|state, ctx, event, data, env| {
462+
if let Event::Command(cmd) = event {
463+
if let Some(disabled) = cmd.get(CHANGE_DISABLED) {
464+
ctx.set_disabled(*disabled);
465+
return;
466+
}
467+
if cmd.is(REQUEST_FOCUS) {
468+
ctx.request_focus();
469+
return;
470+
}
472471
}
473-
}
474-
if let Some(inner) = state {
475-
inner.event(ctx, event, data, env);
476-
}
477-
})
478-
.with_id(id)
479-
};
472+
if let Some(inner) = state {
473+
inner.event(ctx, event, data, env);
474+
}
475+
})
476+
.with_id(id)
477+
};
480478

481479
let id_0 = WidgetId::next();
482480
let id_1 = WidgetId::next();
483481
let id_2 = WidgetId::next();
484482

485483
let root = Flex::row()
486-
.with_child(test_widget_factory(true, id_0, Some(test_widget_factory(true, id_1, None).boxed())))
484+
.with_child(test_widget_factory(
485+
true,
486+
id_0,
487+
Some(test_widget_factory(true, id_1, None).boxed()),
488+
))
487489
.with_child(test_widget_factory(true, id_2, None));
488490

489491
Harness::create_simple((), root, |harness| {

0 commit comments

Comments
 (0)