Skip to content

Commit 0e9d2ec

Browse files
authored
Fix unused_qualifications in Xilem Core (#743)
Most of the change is remove the `expect` and run `cargo fix`. For the orphan view, I've added a blanket exception. At the moment, this only applies to String, but the I did try using `#![no_implicit_prelude]` in that module, but there are a lot of useful things in the implicit prelude, it was worse than the exception.
1 parent 9ee0280 commit 0e9d2ec

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

xilem_core/src/any_view.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl<State, Action, Context, Element, Message> View<State, Action, Context, Mess
182182
where
183183
// Element must be `static` so it can be downcasted
184184
Element: ViewElement + 'static,
185-
Context: crate::ViewPathTracker + 'static,
185+
Context: ViewPathTracker + 'static,
186186
State: 'static,
187187
Action: 'static,
188188
Message: 'static,
@@ -217,10 +217,10 @@ where
217217
fn message(
218218
&self,
219219
view_state: &mut Self::ViewState,
220-
id_path: &[crate::ViewId],
220+
id_path: &[ViewId],
221221
message: Message,
222222
app_state: &mut State,
223-
) -> crate::MessageResult<Action, Message> {
223+
) -> MessageResult<Action, Message> {
224224
self.dyn_message(view_state, id_path, message, app_state)
225225
}
226226
}
@@ -236,7 +236,7 @@ impl<State, Action, Context, Element, Message> View<State, Action, Context, Mess
236236
where
237237
// Element must be `static` so it can be downcasted
238238
Element: ViewElement + 'static,
239-
Context: crate::ViewPathTracker + 'static,
239+
Context: ViewPathTracker + 'static,
240240
State: 'static,
241241
Action: 'static,
242242
Message: 'static,
@@ -271,10 +271,10 @@ where
271271
fn message(
272272
&self,
273273
view_state: &mut Self::ViewState,
274-
id_path: &[crate::ViewId],
274+
id_path: &[ViewId],
275275
message: Message,
276276
app_state: &mut State,
277-
) -> crate::MessageResult<Action, Message> {
277+
) -> MessageResult<Action, Message> {
278278
self.dyn_message(view_state, id_path, message, app_state)
279279
}
280280
}
@@ -288,7 +288,7 @@ impl<State, Action, Context, Element, Message> View<State, Action, Context, Mess
288288
where
289289
// Element must be `static` so it can be downcasted
290290
Element: ViewElement + 'static,
291-
Context: crate::ViewPathTracker + 'static,
291+
Context: ViewPathTracker + 'static,
292292
State: 'static,
293293
Action: 'static,
294294
Message: 'static,
@@ -323,10 +323,10 @@ where
323323
fn message(
324324
&self,
325325
view_state: &mut Self::ViewState,
326-
id_path: &[crate::ViewId],
326+
id_path: &[ViewId],
327327
message: Message,
328328
app_state: &mut State,
329-
) -> crate::MessageResult<Action, Message> {
329+
) -> MessageResult<Action, Message> {
330330
self.dyn_message(view_state, id_path, message, app_state)
331331
}
332332
}
@@ -340,7 +340,7 @@ impl<State, Action, Context, Element, Message> View<State, Action, Context, Mess
340340
where
341341
// Element must be `static` so it can be downcasted
342342
Element: ViewElement + 'static,
343-
Context: crate::ViewPathTracker + 'static,
343+
Context: ViewPathTracker + 'static,
344344
State: 'static,
345345
Action: 'static,
346346
Message: 'static,
@@ -375,10 +375,10 @@ where
375375
fn message(
376376
&self,
377377
view_state: &mut Self::ViewState,
378-
id_path: &[crate::ViewId],
378+
id_path: &[ViewId],
379379
message: Message,
380380
app_state: &mut State,
381-
) -> crate::MessageResult<Action, Message> {
381+
) -> MessageResult<Action, Message> {
382382
self.dyn_message(view_state, id_path, message, app_state)
383383
}
384384
}

xilem_core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#![warn(clippy::print_stdout, clippy::print_stderr)]
2525
// TODO: Remove any items listed as "Deferred"
2626
#![deny(clippy::trivially_copy_pass_by_ref)]
27-
#![expect(unused_qualifications, reason = "Deferred: Noisy")]
2827
#![expect(single_use_lifetimes, reason = "Deferred: Noisy")]
2928
#![expect(clippy::exhaustive_enums, reason = "Deferred: Noisy")]
3029
#![expect(clippy::missing_assert_message, reason = "Deferred: Noisy")]

xilem_core/src/views/fork.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ where
8888
fn message(
8989
&self,
9090
(active_state, alongside_state): &mut Self::ViewState,
91-
id_path: &[crate::ViewId],
91+
id_path: &[ViewId],
9292
message: Message,
9393
app_state: &mut State,
9494
) -> crate::MessageResult<Action, Message> {

xilem_core/src/views/memoize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@ where
250250
fn message(
251251
&self,
252252
view_state: &mut Self::ViewState,
253-
id_path: &[crate::ViewId],
253+
id_path: &[ViewId],
254254
message: Message,
255255
app_state: &mut State,
256-
) -> crate::MessageResult<Action, Message> {
256+
) -> MessageResult<Action, Message> {
257257
let message_result =
258258
view_state
259259
.view

xilem_core/src/views/one_of.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ where
213213
type Element = Context::OneOfElement;
214214

215215
#[doc(hidden)]
216-
type ViewState = hidden::OneOfState<
216+
type ViewState = OneOfState<
217217
A::ViewState,
218218
B::ViewState,
219219
C::ViewState,

xilem_core/src/views/orphan.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// Copyright 2024 the Xilem Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#![allow(
5+
unused_qualifications,
6+
reason = "We have `std` enabled when testing, which means that some items are conditionally in the prelude."
7+
)]
8+
49
use crate::{
510
DynMessage, MessageResult, Mut, View, ViewElement, ViewId, ViewMarker, ViewPathTracker,
611
};

xilem_core/src/views/run_once.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ where
4949
{
5050
const {
5151
assert!(
52-
core::mem::size_of::<F>() == 0,
52+
size_of::<F>() == 0,
5353
"`run_once` will not be ran again when its captured variables are updated.\n\
5454
To ignore this warning, use `run_once_raw`."
5555
);

0 commit comments

Comments
 (0)