Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 0 insertions, 38 deletions

diff --git a/native/src/window/redraw_request.rs b/native/src/window/redraw_request.rs
deleted file mode 100644
index 3b4f0fd3..00000000
--- a/native/src/window/redraw_request.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use crate::time::Instant;
-
-/// A request to redraw a window.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub enum RedrawRequest {
-    /// Redraw the next frame.
-    NextFrame,
-
-    /// Redraw at the given time.
-    At(Instant),
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::time::{Duration, Instant};
-
-    #[test]
-    fn ordering() {
-        let now = Instant::now();
-        let later = now + Duration::from_millis(10);
-
-        assert_eq!(RedrawRequest::NextFrame, RedrawRequest::NextFrame);
-        assert_eq!(RedrawRequest::At(now), RedrawRequest::At(now));
-
-        assert!(RedrawRequest::NextFrame < RedrawRequest::At(now));
-        assert!(RedrawRequest::At(now) > RedrawRequest::NextFrame);
-        assert!(RedrawRequest::At(now) < RedrawRequest::At(later));
-        assert!(RedrawRequest::At(later) > RedrawRequest::At(now));
-
-        assert!(RedrawRequest::NextFrame <= RedrawRequest::NextFrame);
-        assert!(RedrawRequest::NextFrame <= RedrawRequest::At(now));
-        assert!(RedrawRequest::At(now) >= RedrawRequest::NextFrame);
-        assert!(RedrawRequest::At(now) <= RedrawRequest::At(now));
-        assert!(RedrawRequest::At(now) <= RedrawRequest::At(later));
-        assert!(RedrawRequest::At(later) >= RedrawRequest::At(now));
-    }
-}