Fix 1.24.1 build

This commit is contained in:
Osspial
2018-11-09 20:41:15 -05:00
parent 5289d22372
commit d9c3daca9b
3 changed files with 9 additions and 9 deletions

View File

@@ -34,8 +34,8 @@ pub struct EventLoop<T: 'static> {
pub(crate) _marker: ::std::marker::PhantomData<*mut ()> // Not Send nor Sync
}
impl<T> std::fmt::Debug for EventLoop<T> {
fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result {
impl<T> fmt::Debug for EventLoop<T> {
fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result {
fmtr.pad("EventLoop { .. }")
}
}
@@ -154,8 +154,8 @@ impl<T> EventLoopProxy<T> {
}
}
impl<T> std::fmt::Debug for EventLoopProxy<T> {
fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result {
impl<T> fmt::Debug for EventLoopProxy<T> {
fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result {
fmtr.pad("EventLoopProxy { .. }")
}
}

View File

@@ -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)

View File

@@ -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()