Skip to content

Commit 8a6435d

Browse files
eugenesvkeugenesvk
committed
clippy
1 parent e2ac8d0 commit 8a6435d

File tree

7 files changed

+24
-25
lines changed

7 files changed

+24
-25
lines changed

‎src/platform_impl/apple/appkit/view.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ impl WinitView {
908908

909909
/// Reset modifiers and emit a synthetic ModifiersChanged event if deemed necessary.
910910
pub(super) fn reset_modifiers(&self) {
911-
if !self.ivars().modifiers.get().state().is_empty() {
911+
if !self.ivars().modifiers.get().is_empty() {
912912
self.ivars().modifiers.set(Modifiers::empty());
913913
self.queue_event(WindowEvent::ModifiersChanged(self.ivars().modifiers.get()));
914914
}
@@ -972,7 +972,7 @@ impl WinitView {
972972
let phys_mod =
973973
phys_mod_state.entry(logical_key).or_insert(ModLocationMask::empty());
974974

975-
let is_active = current_modifiers.state().contains(event_modifier);
975+
let is_active = current_modifiers.contains(event_modifier);
976976
let mut events = VecDeque::with_capacity(2);
977977

978978
// There is no API for getting whether the button was pressed or released
@@ -1118,14 +1118,14 @@ fn mouse_button(event: &NSEvent) -> MouseButton {
11181118
// we're getting from the operating system, which makes it
11191119
// impossible to provide such events as extra in `KeyEvent`.
11201120
fn replace_event(event: &NSEvent, option_as_alt: OptionAsAlt) -> Retained<NSEvent> {
1121-
let ev_mods = event_mods(event).state();
1121+
let ev_mods = event_mods(event);
11221122
let ignore_alt_characters = match option_as_alt {
11231123
OptionAsAlt::OnlyLeft if lalt_pressed(event) => true,
11241124
OptionAsAlt::OnlyRight if ralt_pressed(event) => true,
1125-
OptionAsAlt::Both if ev_mods.alt_key() => true,
1125+
OptionAsAlt::Both if ev_mods.alt_state() => true,
11261126
_ => false,
1127-
} && !ev_mods.control_key()
1128-
&& !ev_mods.meta_key();
1127+
} && !ev_mods.control_state()
1128+
&& !ev_mods.meta_state();
11291129

11301130
if ignore_alt_characters {
11311131
let ns_chars = unsafe {

‎src/platform_impl/linux/wayland/seat/keyboard/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
8989
// HACK: this is just for GNOME not fixing their ordering issue of modifiers.
9090
if std::mem::take(&mut seat_state.modifiers_pending) {
9191
state.events_sink.push_window_event(
92-
WindowEvent::ModifiersChanged(seat_state.modifiers.into()),
92+
WindowEvent::ModifiersChanged(seat_state.modifiers),
9393
window_id,
9494
);
9595
}
@@ -122,7 +122,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
122122
if !focused {
123123
// Notify that no modifiers are being pressed.
124124
state.events_sink.push_window_event(
125-
WindowEvent::ModifiersChanged(Modifiers::empty().into()),
125+
WindowEvent::ModifiersChanged(Modifiers::empty()),
126126
window_id,
127127
);
128128

@@ -245,7 +245,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
245245
};
246246

247247
state.events_sink.push_window_event(
248-
WindowEvent::ModifiersChanged(seat_state.modifiers.into()),
248+
WindowEvent::ModifiersChanged(seat_state.modifiers),
249249
window_id,
250250
);
251251
},

‎src/platform_impl/linux/x11/event_processor.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ impl EventProcessor {
956956
xkb_state.update_modifiers(mask, 0, 0, 0, 0, Self::core_keyboard_group(state));
957957
let mods: Modifiers = xkb_state.modifiers().into();
958958

959-
let event = WindowEvent::ModifiersChanged(mods.into());
959+
let event = WindowEvent::ModifiersChanged(mods);
960960
app.window_event(&self.target, window_id, event);
961961
}
962962

@@ -1669,7 +1669,7 @@ impl EventProcessor {
16691669
// NOTE: Always update the modifiers to account for case when they've changed
16701670
// and forced was `true`.
16711671
if self.modifiers.replace(modifiers) != modifiers || force {
1672-
let event = WindowEvent::ModifiersChanged(self.modifiers.get().into());
1672+
let event = WindowEvent::ModifiersChanged(self.modifiers.get());
16731673
app.window_event(&self.target, window_id, event);
16741674
}
16751675
}

‎src/platform_impl/web/event_loop/window_target.rs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl ActiveEventLoop {
8484
modifiers.set(Modifiers::empty());
8585
Event::WindowEvent {
8686
window_id,
87-
event: WindowEvent::ModifiersChanged(Modifiers::empty().into()),
87+
event: WindowEvent::ModifiersChanged(Modifiers::empty()),
8888
}
8989
});
9090

@@ -130,7 +130,7 @@ impl ActiveEventLoop {
130130
modifiers.set(active_modifiers);
131131
Event::WindowEvent {
132132
window_id,
133-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
133+
event: WindowEvent::ModifiersChanged(active_modifiers),
134134
}
135135
});
136136

@@ -165,7 +165,7 @@ impl ActiveEventLoop {
165165
modifiers.set(active_modifiers);
166166
Event::WindowEvent {
167167
window_id,
168-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
168+
event: WindowEvent::ModifiersChanged(active_modifiers),
169169
}
170170
});
171171

@@ -203,7 +203,7 @@ impl ActiveEventLoop {
203203
modifiers.set(active_modifiers);
204204
Event::WindowEvent {
205205
window_id,
206-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
206+
event: WindowEvent::ModifiersChanged(active_modifiers),
207207
}
208208
});
209209

@@ -229,7 +229,7 @@ impl ActiveEventLoop {
229229
modifiers.set(active_modifiers);
230230
Event::WindowEvent {
231231
window_id,
232-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
232+
event: WindowEvent::ModifiersChanged(active_modifiers),
233233
}
234234
});
235235

@@ -255,9 +255,7 @@ impl ActiveEventLoop {
255255
modifiers.set(active_modifiers);
256256
Event::WindowEvent {
257257
window_id,
258-
event: WindowEvent::ModifiersChanged(
259-
active_modifiers.into(),
260-
),
258+
event: WindowEvent::ModifiersChanged(active_modifiers),
261259
}
262260
});
263261

@@ -285,7 +283,7 @@ impl ActiveEventLoop {
285283
modifiers.set(active_modifiers);
286284
Event::WindowEvent {
287285
window_id,
288-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
286+
event: WindowEvent::ModifiersChanged(active_modifiers),
289287
}
290288
});
291289

@@ -312,7 +310,7 @@ impl ActiveEventLoop {
312310
modifiers.set(active_modifiers);
313311
Event::WindowEvent {
314312
window_id,
315-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
313+
event: WindowEvent::ModifiersChanged(active_modifiers),
316314
}
317315
});
318316

@@ -340,7 +338,7 @@ impl ActiveEventLoop {
340338
modifiers.set(active_modifiers);
341339
Event::WindowEvent {
342340
window_id,
343-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
341+
event: WindowEvent::ModifiersChanged(active_modifiers),
344342
}
345343
});
346344

@@ -365,7 +363,7 @@ impl ActiveEventLoop {
365363
modifiers.set(active_modifiers);
366364
Event::WindowEvent {
367365
window_id,
368-
event: WindowEvent::ModifiersChanged(active_modifiers.into()),
366+
event: WindowEvent::ModifiersChanged(active_modifiers),
369367
}
370368
});
371369

‎src/platform_impl/windows/event_loop.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ unsafe fn lose_active_focus(window: HWND, userdata: &WindowData) {
960960
use winit_core::event::WindowEvent::{Focused, ModifiersChanged};
961961

962962
userdata.window_state_lock().modifiers = Modifiers::empty();
963-
userdata.send_window_event(window, ModifiersChanged(Modifiers::empty().into()));
963+
userdata.send_window_event(window, ModifiersChanged(Modifiers::empty()));
964964

965965
userdata.send_window_event(window, Focused(false));
966966
}

‎winit-core/src/event.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,7 @@ mod tests {
10431043
use dpi::PhysicalPosition;
10441044

10451045
use crate::event;
1046+
use crate::keyboard::Modifiers;
10461047

10471048
macro_rules! foreach_event {
10481049
($closure:expr) => {{

‎winit-core/src/keyboard.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1723,7 +1723,7 @@ bitflags! {
17231723
/// The "Right Shift" modifier.
17241724
const RSHIFT = 0b_1 << 0;
17251725
/// The "Left Shift" modifier.
1726-
const LSHIFT = 0b10 << 0;
1726+
const LSHIFT = 0b10;
17271727
/// The "Right Control" modifier.
17281728
const RCONTROL = 0b_1 << 2;
17291729
/// The "Left Control" modifier.

0 commit comments

Comments
 (0)