Skip to content

Commit 751bd62

Browse files
DJMcNabDJMcNab
authored
Fix elided_lifetimes_in_path in Xilem Core (#740)
1 parent 2b509fb commit 751bd62

File tree

17 files changed

+110
-94
lines changed

17 files changed

+110
-94
lines changed

‎xilem_core/examples/filesystem.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//! An example using Xilem Core to manipulate a filesystem.
55
66
#![expect(clippy::use_self, reason = "Deferred: Noisy")]
7-
#![expect(elided_lifetimes_in_paths, reason = "Deferred: Noisy")]
87
#![expect(let_underscore_drop, reason = "Deferred: Noisy")]
98

109
use std::io::stdin;
@@ -112,7 +111,7 @@ impl SuperElement<FsPath, ViewCtx> for FsPath {
112111

113112
fn with_downcast_val<R>(
114113
this: Self::Mut<'_>,
115-
f: impl FnOnce(Mut<FsPath>) -> R,
114+
f: impl FnOnce(Mut<'_, FsPath>) -> R,
116115
) -> (Self::Mut<'_>, R) {
117116
let ret = f(this);
118117
(this, ret)
@@ -170,7 +169,7 @@ impl<State, Action> View<State, Action, ViewCtx> for File {
170169
prev: &Self,
171170
_view_state: &mut Self::ViewState,
172171
ctx: &mut ViewCtx,
173-
element: Mut<Self::Element>,
172+
element: Mut<'_, Self::Element>,
174173
) {
175174
if prev.name != self.name {
176175
let new_path = ctx.current_folder_path.join(&*self.name);
@@ -186,7 +185,7 @@ impl<State, Action> View<State, Action, ViewCtx> for File {
186185
&self,
187186
_view_state: &mut Self::ViewState,
188187
_ctx: &mut ViewCtx,
189-
element: Mut<Self::Element>,
188+
element: Mut<'_, Self::Element>,
190189
) {
191190
let _ = std::fs::remove_file(element);
192191
}

‎xilem_core/examples/user_interface.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
//! Model version of Masonry for exploration
55
6-
#![expect(elided_lifetimes_in_paths, reason = "Deferred: Noisy")]
7-
86
use core::any::Any;
97

108
use xilem_core::{
@@ -66,7 +64,7 @@ impl<State, Action> View<State, Action, ViewCtx> for Button {
6664
_prev: &Self,
6765
_view_state: &mut Self::ViewState,
6866
_ctx: &mut ViewCtx,
69-
_element: Mut<Self::Element>,
67+
_element: Mut<'_, Self::Element>,
7068
) {
7169
// Nothing to do
7270
}
@@ -75,7 +73,7 @@ impl<State, Action> View<State, Action, ViewCtx> for Button {
7573
&self,
7674
_view_state: &mut Self::ViewState,
7775
_ctx: &mut ViewCtx,
78-
_element: Mut<Self::Element>,
76+
_element: Mut<'_, Self::Element>,
7977
) {
8078
// Nothing to do
8179
}

‎xilem_core/src/any_view.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ where
200200
prev: &Self,
201201
view_state: &mut Self::ViewState,
202202
ctx: &mut Context,
203-
element: Mut<Self::Element>,
203+
element: Mut<'_, Self::Element>,
204204
) {
205205
self.dyn_rebuild(view_state, ctx, prev, element);
206206
}
@@ -209,7 +209,7 @@ where
209209
&self,
210210
view_state: &mut Self::ViewState,
211211
ctx: &mut Context,
212-
element: Mut<Self::Element>,
212+
element: Mut<'_, Self::Element>,
213213
) {
214214
self.dyn_teardown(view_state, ctx, element);
215215
}
@@ -254,7 +254,7 @@ where
254254
prev: &Self,
255255
view_state: &mut Self::ViewState,
256256
ctx: &mut Context,
257-
element: Mut<Self::Element>,
257+
element: Mut<'_, Self::Element>,
258258
) {
259259
self.dyn_rebuild(view_state, ctx, prev, element);
260260
}
@@ -263,7 +263,7 @@ where
263263
&self,
264264
view_state: &mut Self::ViewState,
265265
ctx: &mut Context,
266-
element: Mut<Self::Element>,
266+
element: Mut<'_, Self::Element>,
267267
) {
268268
self.dyn_teardown(view_state, ctx, element);
269269
}
@@ -306,7 +306,7 @@ where
306306
prev: &Self,
307307
view_state: &mut Self::ViewState,
308308
ctx: &mut Context,
309-
element: Mut<Self::Element>,
309+
element: Mut<'_, Self::Element>,
310310
) {
311311
self.dyn_rebuild(view_state, ctx, prev, element);
312312
}
@@ -315,7 +315,7 @@ where
315315
&self,
316316
view_state: &mut Self::ViewState,
317317
ctx: &mut Context,
318-
element: Mut<Self::Element>,
318+
element: Mut<'_, Self::Element>,
319319
) {
320320
self.dyn_teardown(view_state, ctx, element);
321321
}
@@ -358,7 +358,7 @@ where
358358
prev: &Self,
359359
view_state: &mut Self::ViewState,
360360
ctx: &mut Context,
361-
element: Mut<Self::Element>,
361+
element: Mut<'_, Self::Element>,
362362
) {
363363
self.dyn_rebuild(view_state, ctx, prev, element);
364364
}
@@ -367,7 +367,7 @@ where
367367
&self,
368368
view_state: &mut Self::ViewState,
369369
ctx: &mut Context,
370-
element: Mut<Self::Element>,
370+
element: Mut<'_, Self::Element>,
371371
) {
372372
self.dyn_teardown(view_state, ctx, element);
373373
}

‎xilem_core/src/element.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ where
5858
/// You can safely use this methods in contexts where it is known that the
5959
///
6060
/// If you need to return a value, see [`with_downcast_val`](SuperElement::with_downcast_val).
61-
fn with_downcast(this: Mut<Self>, f: impl FnOnce(Mut<Child>)) -> Mut<Self> {
61+
fn with_downcast(this: Mut<'_, Self>, f: impl FnOnce(Mut<'_, Child>)) -> Mut<'_, Self> {
6262
let (this, ()) = Self::with_downcast_val(this, f);
6363
this
6464
}
@@ -68,8 +68,10 @@ where
6868
/// `Self::upcast`.
6969
///
7070
/// If you don't need to return a value, see [`with_downcast`](SuperElement::with_downcast).
71-
fn with_downcast_val<R>(this: Mut<Self>, f: impl FnOnce(Mut<Child>) -> R)
72-
-> (Self::Mut<'_>, R);
71+
fn with_downcast_val<R>(
72+
this: Mut<'_, Self>,
73+
f: impl FnOnce(Mut<'_, Child>) -> R,
74+
) -> (Self::Mut<'_>, R);
7375
}
7476

7577
/// An element which can be used for an [`AnyView`](crate::AnyView) containing `Child`.
@@ -100,8 +102,8 @@ impl<Context> SuperElement<NoElement, Context> for NoElement {
100102
}
101103

102104
fn with_downcast_val<R>(
103-
this: Mut<Self>,
104-
f: impl FnOnce(Mut<NoElement>) -> R,
105+
this: Mut<'_, Self>,
106+
f: impl FnOnce(Mut<'_, NoElement>) -> R,
105107
) -> (Self::Mut<'_>, R) {
106108
((), f(this))
107109
}

‎xilem_core/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#![expect(single_use_lifetimes, reason = "Deferred: Noisy")]
2929
#![expect(clippy::exhaustive_enums, reason = "Deferred: Noisy")]
3030
#![expect(clippy::missing_assert_message, reason = "Deferred: Noisy")]
31-
#![expect(elided_lifetimes_in_paths, reason = "Deferred: Noisy")]
3231
#![expect(clippy::use_self, reason = "Deferred: Noisy")]
3332
#![expect(clippy::missing_errors_doc, reason = "Can be quite noisy?")]
3433
#![expect(

‎xilem_core/src/view.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub trait View<State, Action, Context: ViewPathTracker, Message = DynMessage>:
8181
prev: &Self,
8282
view_state: &mut Self::ViewState,
8383
ctx: &mut Context,
84-
element: Mut<Self::Element>,
84+
element: Mut<'_, Self::Element>,
8585
);
8686

8787
/// Handle `element` being removed from the tree.
@@ -95,7 +95,7 @@ pub trait View<State, Action, Context: ViewPathTracker, Message = DynMessage>:
9595
&self,
9696
view_state: &mut Self::ViewState,
9797
ctx: &mut Context,
98-
element: Mut<Self::Element>,
98+
element: Mut<'_, Self::Element>,
9999
);
100100

101101
/// Route `message` to `id_path`, if that is still a valid path.
@@ -179,7 +179,7 @@ where
179179
prev: &Self,
180180
view_state: &mut Self::ViewState,
181181
ctx: &mut Context,
182-
element: Mut<Self::Element>,
182+
element: Mut<'_, Self::Element>,
183183
) {
184184
self.deref().rebuild(prev, view_state, ctx, element);
185185
}
@@ -188,7 +188,7 @@ where
188188
&self,
189189
view_state: &mut Self::ViewState,
190190
ctx: &mut Context,
191-
element: Mut<Self::Element>,
191+
element: Mut<'_, Self::Element>,
192192
) {
193193
self.deref().teardown(view_state, ctx, element);
194194
}
@@ -242,7 +242,7 @@ where
242242
prev: &Self,
243243
view_state: &mut Self::ViewState,
244244
ctx: &mut Context,
245-
element: Mut<Self::Element>,
245+
element: Mut<'_, Self::Element>,
246246
) {
247247
if core::mem::take(&mut view_state.dirty) || !Arc::ptr_eq(self, prev) {
248248
self.deref()
@@ -254,7 +254,7 @@ where
254254
&self,
255255
view_state: &mut Self::ViewState,
256256
ctx: &mut Context,
257-
element: Mut<Self::Element>,
257+
element: Mut<'_, Self::Element>,
258258
) {
259259
self.deref()
260260
.teardown(&mut view_state.view_state, ctx, element);
@@ -303,7 +303,7 @@ where
303303
prev: &Self,
304304
view_state: &mut Self::ViewState,
305305
ctx: &mut Context,
306-
element: Mut<Self::Element>,
306+
element: Mut<'_, Self::Element>,
307307
) {
308308
if core::mem::take(&mut view_state.dirty) || !Rc::ptr_eq(self, prev) {
309309
self.deref()
@@ -315,7 +315,7 @@ where
315315
&self,
316316
view_state: &mut Self::ViewState,
317317
ctx: &mut Context,
318-
element: Mut<Self::Element>,
318+
element: Mut<'_, Self::Element>,
319319
) {
320320
self.deref()
321321
.teardown(&mut view_state.view_state, ctx, element);

‎xilem_core/src/views/adapt.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub struct Adapt<
1717
Message,
1818
ProxyFn = fn(
1919
&mut ParentState,
20-
AdaptThunk<ChildState, ChildAction, Context, ChildView, Message>,
20+
AdaptThunk<'_, ChildState, ChildAction, Context, ChildView, Message>,
2121
) -> MessageResult<ParentAction>,
2222
> {
2323
proxy_fn: ProxyFn,
@@ -120,7 +120,7 @@ where
120120
ChildView: View<ChildState, ChildAction, Context, Message>,
121121
ProxyFn: Fn(
122122
&mut ParentState,
123-
AdaptThunk<ChildState, ChildAction, Context, ChildView, Message>,
123+
AdaptThunk<'_, ChildState, ChildAction, Context, ChildView, Message>,
124124
) -> MessageResult<ParentAction, Message>
125125
+ 'static,
126126
{
@@ -163,7 +163,7 @@ where
163163
V: View<ChildState, ChildAction, Context, Message>,
164164
F: Fn(
165165
&mut ParentState,
166-
AdaptThunk<ChildState, ChildAction, Context, V, Message>,
166+
AdaptThunk<'_, ChildState, ChildAction, Context, V, Message>,
167167
) -> MessageResult<ParentAction, Message>
168168
+ 'static,
169169
{
@@ -180,7 +180,7 @@ where
180180
prev: &Self,
181181
view_state: &mut Self::ViewState,
182182
ctx: &mut Context,
183-
element: Mut<Self::Element>,
183+
element: Mut<'_, Self::Element>,
184184
) {
185185
self.child.rebuild(&prev.child, view_state, ctx, element);
186186
}
@@ -189,7 +189,7 @@ where
189189
&self,
190190
view_state: &mut Self::ViewState,
191191
ctx: &mut Context,
192-
element: Mut<Self::Element>,
192+
element: Mut<'_, Self::Element>,
193193
) {
194194
self.child.teardown(view_state, ctx, element);
195195
}

‎xilem_core/src/views/fork.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ where
5353
prev: &Self,
5454
(active_state, alongside_state): &mut Self::ViewState,
5555
ctx: &mut Context,
56-
element: Mut<Self::Element>,
56+
element: Mut<'_, Self::Element>,
5757
) {
5858
ctx.with_id(ViewId::new(0), |ctx| {
5959
self.active_view
@@ -73,7 +73,7 @@ where
7373
&self,
7474
(active_state, alongside_state): &mut Self::ViewState,
7575
ctx: &mut Context,
76-
element: Mut<Self::Element>,
76+
element: Mut<'_, Self::Element>,
7777
) {
7878
ctx.with_id(ViewId::new(0), |ctx| {
7979
self.alongside_view

‎xilem_core/src/views/map_action.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ where
110110
prev: &Self,
111111
view_state: &mut Self::ViewState,
112112
ctx: &mut Context,
113-
element: Mut<Self::Element>,
113+
element: Mut<'_, Self::Element>,
114114
) {
115115
self.child.rebuild(&prev.child, view_state, ctx, element);
116116
}
@@ -119,7 +119,7 @@ where
119119
&self,
120120
view_state: &mut Self::ViewState,
121121
ctx: &mut Context,
122-
element: Mut<Self::Element>,
122+
element: Mut<'_, Self::Element>,
123123
) {
124124
self.child.teardown(view_state, ctx, element);
125125
}

‎xilem_core/src/views/map_state.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ where
152152
prev: &Self,
153153
view_state: &mut Self::ViewState,
154154
ctx: &mut Context,
155-
element: Mut<Self::Element>,
155+
element: Mut<'_, Self::Element>,
156156
) {
157157
self.child.rebuild(&prev.child, view_state, ctx, element);
158158
}
@@ -161,7 +161,7 @@ where
161161
&self,
162162
view_state: &mut Self::ViewState,
163163
ctx: &mut Context,
164-
element: Mut<Self::Element>,
164+
element: Mut<'_, Self::Element>,
165165
) {
166166
self.child.teardown(view_state, ctx, element);
167167
}

0 commit comments

Comments
 (0)