Skip to content

Commit 5289d22

Browse files
committed
Remove serde implementations from ControlFlow
1 parent 92ac3d6 commit 5289d22

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
- Can be used to perform logic that depends on all events being processed (e.g. an iteration of a game loop).
3636
- `LoopDestroyed` is emitted when the `run` or `run_return` method is about to exit.
3737
- Rename `MonitorId` to `MonitorHandle`.
38+
- Removed `serde` implementations from `ControlFlow`.
3839

3940
# Version 0.18.0 (2018-11-07)
4041

src/event_loop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ impl<T> std::fmt::Debug for EventLoop<T> {
5353
///
5454
/// [events_cleared]: ../event/enum.Event.html#variant.EventsCleared
5555
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
56-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
5756
pub enum ControlFlow {
5857
/// When the current loop iteration finishes, immediately begin a new iteration regardless of
5958
/// whether or not new events are available to process.

tests/serde_objects.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
extern crate serde;
44
extern crate winit;
55

6-
use winit::{ControlFlow, MouseCursor};
7-
use winit::{
6+
use winit::window::{MouseCursor};
7+
use winit::event::{
88
KeyboardInput, TouchPhase, ElementState, MouseButton, MouseScrollDelta, VirtualKeyCode,
99
ModifiersState
1010
};
@@ -14,8 +14,7 @@ use serde::{Serialize, Deserialize};
1414
fn needs_serde<S: Serialize + Deserialize<'static>>() {}
1515

1616
#[test]
17-
fn root_serde() {
18-
needs_serde::<ControlFlow>();
17+
fn window_serde() {
1918
needs_serde::<MouseCursor>();
2019
}
2120

0 commit comments

Comments
 (0)