Skip to content

Commit 6af1949

Browse files
authored
Fix shadow_unrelated in Xilem Core (#745)
Note, this fix is only excluding the false positives as a result of: rust-lang/rust-clippy#10780 When/if the fix for that (rust-lang/rust-clippy#13677) trickles onto stable, we can remove the expects.
1 parent 3e6909e commit 6af1949

File tree

1 file changed

+37
-36
lines changed

1 file changed

+37
-36
lines changed

xilem_core/src/views/one_of.rs

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -230,40 +230,40 @@ where
230230
let generation = 0;
231231
let (element, state) = ctx.with_id(ViewId::new(generation), |ctx| match self {
232232
OneOf::A(v) => {
233-
let (element, state) = v.build(ctx);
234-
(OneOf::A(element), OneOf::A(state))
233+
let (new_element, state) = v.build(ctx);
234+
(OneOf::A(new_element), OneOf::A(state))
235235
}
236236
OneOf::B(v) => {
237-
let (element, state) = v.build(ctx);
238-
(OneOf::B(element), OneOf::B(state))
237+
let (new_element, state) = v.build(ctx);
238+
(OneOf::B(new_element), OneOf::B(state))
239239
}
240240
OneOf::C(v) => {
241-
let (element, state) = v.build(ctx);
242-
(OneOf::C(element), OneOf::C(state))
241+
let (new_element, state) = v.build(ctx);
242+
(OneOf::C(new_element), OneOf::C(state))
243243
}
244244
OneOf::D(v) => {
245-
let (element, state) = v.build(ctx);
246-
(OneOf::D(element), OneOf::D(state))
245+
let (new_element, state) = v.build(ctx);
246+
(OneOf::D(new_element), OneOf::D(state))
247247
}
248248
OneOf::E(v) => {
249-
let (element, state) = v.build(ctx);
250-
(OneOf::E(element), OneOf::E(state))
249+
let (new_element, state) = v.build(ctx);
250+
(OneOf::E(new_element), OneOf::E(state))
251251
}
252252
OneOf::F(v) => {
253-
let (element, state) = v.build(ctx);
254-
(OneOf::F(element), OneOf::F(state))
253+
let (new_element, state) = v.build(ctx);
254+
(OneOf::F(new_element), OneOf::F(state))
255255
}
256256
OneOf::G(v) => {
257-
let (element, state) = v.build(ctx);
258-
(OneOf::G(element), OneOf::G(state))
257+
let (new_element, state) = v.build(ctx);
258+
(OneOf::G(new_element), OneOf::G(state))
259259
}
260260
OneOf::H(v) => {
261-
let (element, state) = v.build(ctx);
262-
(OneOf::H(element), OneOf::H(state))
261+
let (new_element, state) = v.build(ctx);
262+
(OneOf::H(new_element), OneOf::H(state))
263263
}
264264
OneOf::I(v) => {
265-
let (element, state) = v.build(ctx);
266-
(OneOf::I(element), OneOf::I(state))
265+
let (new_element, state) = v.build(ctx);
266+
(OneOf::I(new_element), OneOf::I(state))
267267
}
268268
});
269269
(
@@ -415,43 +415,44 @@ where
415415
view_state.generation = view_state.generation.wrapping_add(1);
416416

417417
// And rebuild the new one
418+
#[expect(clippy::shadow_unrelated, reason = "The old value is no longer valid.")]
418419
let id = ViewId::new(view_state.generation);
419420
let (new_element, state) = ctx.with_id(id, |ctx| match self {
420421
OneOf::A(v) => {
421-
let (element, state) = v.build(ctx);
422-
(OneOf::A(element), OneOf::A(state))
422+
let (new_element, state) = v.build(ctx);
423+
(OneOf::A(new_element), OneOf::A(state))
423424
}
424425
OneOf::B(v) => {
425-
let (element, state) = v.build(ctx);
426-
(OneOf::B(element), OneOf::B(state))
426+
let (new_element, state) = v.build(ctx);
427+
(OneOf::B(new_element), OneOf::B(state))
427428
}
428429
OneOf::C(v) => {
429-
let (element, state) = v.build(ctx);
430-
(OneOf::C(element), OneOf::C(state))
430+
let (new_element, state) = v.build(ctx);
431+
(OneOf::C(new_element), OneOf::C(state))
431432
}
432433
OneOf::D(v) => {
433-
let (element, state) = v.build(ctx);
434-
(OneOf::D(element), OneOf::D(state))
434+
let (new_element, state) = v.build(ctx);
435+
(OneOf::D(new_element), OneOf::D(state))
435436
}
436437
OneOf::E(v) => {
437-
let (element, state) = v.build(ctx);
438-
(OneOf::E(element), OneOf::E(state))
438+
let (new_element, state) = v.build(ctx);
439+
(OneOf::E(new_element), OneOf::E(state))
439440
}
440441
OneOf::F(v) => {
441-
let (element, state) = v.build(ctx);
442-
(OneOf::F(element), OneOf::F(state))
442+
let (new_element, state) = v.build(ctx);
443+
(OneOf::F(new_element), OneOf::F(state))
443444
}
444445
OneOf::G(v) => {
445-
let (element, state) = v.build(ctx);
446-
(OneOf::G(element), OneOf::G(state))
446+
let (new_element, state) = v.build(ctx);
447+
(OneOf::G(new_element), OneOf::G(state))
447448
}
448449
OneOf::H(v) => {
449-
let (element, state) = v.build(ctx);
450-
(OneOf::H(element), OneOf::H(state))
450+
let (new_element, state) = v.build(ctx);
451+
(OneOf::H(new_element), OneOf::H(state))
451452
}
452453
OneOf::I(v) => {
453-
let (element, state) = v.build(ctx);
454-
(OneOf::I(element), OneOf::I(state))
454+
let (new_element, state) = v.build(ctx);
455+
(OneOf::I(new_element), OneOf::I(state))
455456
}
456457
});
457458
view_state.inner_state = state;

0 commit comments

Comments
 (0)