From d9c3daca9b459e02ef614568fe803a723965fe8d Mon Sep 17 00:00:00 2001 From: Osspial Date: Fri, 9 Nov 2018 20:41:15 -0500 Subject: [PATCH] Fix 1.24.1 build --- src/event_loop.rs | 8 ++++---- src/platform_impl/windows/window.rs | 2 +- src/window.rs | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/event_loop.rs b/src/event_loop.rs index b23c4a39b..c2af36890 100644 --- a/src/event_loop.rs +++ b/src/event_loop.rs @@ -34,8 +34,8 @@ pub struct EventLoop { pub(crate) _marker: ::std::marker::PhantomData<*mut ()> // Not Send nor Sync } -impl std::fmt::Debug for EventLoop { - fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result { +impl fmt::Debug for EventLoop { + fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result { fmtr.pad("EventLoop { .. }") } } @@ -154,8 +154,8 @@ impl EventLoopProxy { } } -impl std::fmt::Debug for EventLoopProxy { - fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result { +impl fmt::Debug for EventLoopProxy { + fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result { fmtr.pad("EventLoopProxy { .. }") } } diff --git a/src/platform_impl/windows/window.rs b/src/platform_impl/windows/window.rs index ee40fcfd1..78bc5e14e 100644 --- a/src/platform_impl/windows/window.rs +++ b/src/platform_impl/windows/window.rs @@ -614,7 +614,7 @@ impl Window { let mut window_state_lock = self.window_state.lock(); unsafe { let monitor_rect = monitor.as_ref() - .map(|RootMonitorHandle{ ref inner }| { + .map(|&RootMonitorHandle{ ref inner }| { let (x, y): (i32, i32) = inner.get_position().into(); let (width, height): (u32, u32) = inner.get_dimensions().into(); (x, y, width, height) diff --git a/src/window.rs b/src/window.rs index 05fe6a552..a68919980 100644 --- a/src/window.rs +++ b/src/window.rs @@ -33,8 +33,8 @@ pub struct Window { pub(crate) window: platform_impl::Window, } -impl std::fmt::Debug for Window { - fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result { +impl fmt::Debug for Window { + fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result { fmtr.pad("Window { .. }") } } @@ -58,8 +58,8 @@ pub struct WindowBuilder { pub(crate) platform_specific: platform_impl::PlatformSpecificWindowBuilderAttributes, } -impl std::fmt::Debug for WindowBuilder { - fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result { +impl fmt::Debug for WindowBuilder { + fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result { fmtr.debug_struct("WindowBuilder") .field("window", &self.window) .finish()