Cargo fmt pass (#198)

This commit is contained in:
Daniel Collin 2020-07-09 11:53:46 +02:00 committed by GitHub
parent cb0ceee910
commit f94eef1c7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

View file

@ -104,8 +104,6 @@ mod window_flags;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
use self::os::macos as imp; use self::os::macos as imp;
#[cfg(target_os = "redox")]
use self::os::redox as imp;
#[cfg(any( #[cfg(any(
target_os = "linux", target_os = "linux",
target_os = "freebsd", target_os = "freebsd",
@ -114,6 +112,8 @@ use self::os::redox as imp;
target_os = "openbsd" target_os = "openbsd"
))] ))]
use self::os::posix as imp; use self::os::posix as imp;
#[cfg(target_os = "redox")]
use self::os::redox as imp;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
use self::os::windows as imp; use self::os::windows as imp;
/// ///

View file

@ -1,7 +1,5 @@
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
pub mod macos; pub mod macos;
#[cfg(target_os = "redox")]
pub mod redox;
#[cfg(any( #[cfg(any(
target_os = "linux", target_os = "linux",
target_os = "freebsd", target_os = "freebsd",
@ -10,5 +8,7 @@ pub mod redox;
target_os = "openbsd" target_os = "openbsd"
))] ))]
pub mod posix; pub mod posix;
#[cfg(target_os = "redox")]
pub mod redox;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub mod windows; pub mod windows;

View file

@ -767,7 +767,9 @@ impl Window {
unsafe { unsafe {
let mut msg = mem::zeroed(); let mut msg = mem::zeroed();
while winuser::PeekMessageW(&mut msg, std::ptr::null_mut(), 0, 0, winuser::PM_REMOVE) != 0 { while winuser::PeekMessageW(&mut msg, std::ptr::null_mut(), 0, 0, winuser::PM_REMOVE)
!= 0
{
// Make this code a bit nicer // Make this code a bit nicer
if self.accel_table == ptr::null_mut() { if self.accel_table == ptr::null_mut() {
winuser::TranslateMessage(&mut msg); winuser::TranslateMessage(&mut msg);