Replace #[macro_use] with normal use (#808)

* Replace #[macro_use] with normal use

* Fix Windows build

* Combine imports

* Reorder imports

Author: totsteps

druid-shell/src/keyboard.rs

@@ -14,9 +14,10 @@
 
 //! Keyboard event types and helpers
 
-use super::keycodes::KeyCode;
 use std::fmt;
 
+use super::keycodes::KeyCode;
+
 /// A keyboard event, generated on every key press and key release.
 #[derive(Debug, Clone, Copy)]
 pub struct KeyEvent {

druid-shell/src/lib.rs

@@ -24,22 +24,6 @@
 pub use kurbo;
 pub use piet_common as piet;
 
-#[cfg(target_os = "windows")]
-#[macro_use]
-extern crate winapi;
-
-#[cfg(all(target_os = "macos", not(feature = "use_gtk")))]
-#[macro_use]
-extern crate objc;
-
-#[cfg(not(any(feature = "use_gtk", target_os = "linux")))]
-#[macro_use]
-extern crate lazy_static;
-
-#[cfg(all(target_os = "linux", feature = "x11"))]
-#[macro_use]
-extern crate lazy_static;
-
 mod application;
 mod clipboard;
 mod common_util;

druid-shell/src/platform/gtk/clipboard.rs

@@ -14,10 +14,11 @@
 
 //! Interactions with the system pasteboard on GTK+.
 
-use crate::clipboard::{ClipboardFormat, FormatId};
 use gdk::Atom;
 use gtk::{TargetEntry, TargetFlags};
 
+use crate::clipboard::{ClipboardFormat, FormatId};
+
 /// The system clipboard.
 #[derive(Debug, Clone)]
 pub struct Clipboard;

druid-shell/src/platform/gtk/dialog.rs

@@ -16,9 +16,9 @@
 
 use std::ffi::OsString;
 
-use crate::dialog::{FileDialogOptions, FileDialogType};
 use gtk::{FileChooserAction, FileChooserExt, NativeDialogExt, ResponseType, Window};
 
+use crate::dialog::{FileDialogOptions, FileDialogType};
 use crate::Error;
 
 pub(crate) fn get_file_dialog_path(

druid-shell/src/platform/mac/application.rs

@@ -18,15 +18,17 @@
 
 use std::ffi::c_void;
 
-use super::clipboard::Clipboard;
-use super::util;
-use crate::application::AppHandler;
-
 use cocoa::appkit::{NSApp, NSApplication, NSApplicationActivationPolicyRegular};
 use cocoa::base::{id, nil, YES};
 use cocoa::foundation::NSAutoreleasePool;
+use lazy_static::lazy_static;
 use objc::declare::ClassDecl;
 use objc::runtime::{Class, Object, Sel};
+use objc::{class, msg_send, sel, sel_impl};
+
+use super::clipboard::Clipboard;
+use super::util;
+use crate::application::AppHandler;
 
 static APP_HANDLER_IVAR: &str = "druidAppHandler";
 

druid-shell/src/platform/mac/clipboard.rs

@@ -17,6 +17,7 @@
 use cocoa::appkit::NSPasteboardTypeString;
 use cocoa::base::{id, nil, BOOL, YES};
 use cocoa::foundation::{NSArray, NSInteger, NSUInteger};
+use objc::{class, msg_send, sel, sel_impl};
 
 use super::util;
 use crate::clipboard::{ClipboardFormat, FormatId};

druid-shell/src/platform/mac/dialog.rs

@@ -20,6 +20,7 @@ use std::ffi::OsString;
 
 use cocoa::base::{id, nil, YES};
 use cocoa::foundation::{NSArray, NSInteger};
+use objc::{class, msg_send, sel, sel_impl};
 
 use super::util::{from_nsstring, make_nsstring};
 use crate::dialog::{FileDialogOptions, FileDialogType};

druid-shell/src/platform/mac/menu.rs

@@ -17,6 +17,7 @@
 use cocoa::appkit::{NSEventModifierFlags, NSMenu, NSMenuItem};
 use cocoa::base::{id, nil, NO};
 use cocoa::foundation::NSAutoreleasePool;
+use objc::{msg_send, sel, sel_impl};
 
 use super::util::make_nsstring;
 use crate::common_util::strip_access_key;

druid-shell/src/platform/mac/util.rs

@@ -18,6 +18,7 @@ use std::ffi::c_void;
 
 use cocoa::base::{id, nil, BOOL, YES};
 use cocoa::foundation::{NSAutoreleasePool, NSString, NSUInteger};
+use objc::{class, msg_send, sel, sel_impl};
 
 /// Panic if not on the main thread.assert_main_thread()
 ///

druid-shell/src/platform/mac/window.rs

@@ -29,9 +29,11 @@ use cocoa::appkit::{
 };
 use cocoa::base::{id, nil, BOOL, NO, YES};
 use cocoa::foundation::{NSAutoreleasePool, NSPoint, NSRect, NSSize, NSString};
+use lazy_static::lazy_static;
 use objc::declare::ClassDecl;
 use objc::rc::WeakPtr;
 use objc::runtime::{Class, Object, Sel};
+use objc::{class, msg_send, sel, sel_impl};
 
 use cairo::{Context, QuartzSurface};
 use log::{error, info};

druid-shell/src/platform/windows/accels.rs

@@ -14,13 +14,14 @@
 
 //! Wrappers for Windows of Accelerate Table.
 
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+use lazy_static::lazy_static;
 use winapi::ctypes::c_int;
 use winapi::shared::windef::*;
 use winapi::um::winuser::*;
 
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-
 // NOTE:
 // https://docs.microsoft.com/en-us/windows/win32/wsw/thread-safety
 // All handles you obtain from functions in Kernel32 are thread-safe,

druid-shell/src/platform/windows/dcomp.rs

@@ -21,6 +21,9 @@
 use std::mem;
 use std::ops::{Deref, DerefMut};
 use std::ptr::{null, null_mut};
+
+use log::error;
+
 use winapi::shared::dxgi::IDXGIDevice;
 use winapi::shared::dxgi1_2::DXGI_ALPHA_MODE_IGNORE;
 use winapi::shared::dxgiformat::DXGI_FORMAT_B8G8R8A8_UNORM;
@@ -38,8 +41,6 @@ use winapi::um::winnt::HRESULT;
 use winapi::Interface;
 use wio::com::ComPtr;
 
-use log::error;
-
 use super::util::OPTIONAL_FUNCTIONS;
 
 unsafe fn wrap<T, U, F>(hr: HRESULT, ptr: *mut T, f: F) -> Result<U, HRESULT>

druid-shell/src/platform/windows/dialog.rs

@@ -22,6 +22,10 @@
 
 #![allow(non_upper_case_globals)]
 
+use std::convert::TryInto;
+use std::ffi::OsString;
+use std::ptr::null_mut;
+
 use winapi::shared::minwindef::*;
 use winapi::shared::ntdef::LPWSTR;
 use winapi::shared::windef::*;
@@ -30,16 +34,12 @@ use winapi::um::combaseapi::*;
 use winapi::um::shobjidl::*;
 use winapi::um::shobjidl_core::*;
 use winapi::um::shtypes::COMDLG_FILTERSPEC;
-use winapi::Interface;
+use winapi::{Interface, DEFINE_GUID};
 use wio::com::ComPtr;
 
 use super::error::Error;
 use super::util::{as_result, FromWide, ToWide};
 use crate::dialog::{FileDialogOptions, FileDialogType, FileSpec};
-use std::ffi::OsString;
-use std::ptr::null_mut;
-
-use std::convert::TryInto;
 
 // TODO: remove these when they get added to winapi
 DEFINE_GUID! {CLSID_FileOpenDialog,

druid-shell/src/platform/windows/error.rs

@@ -15,9 +15,8 @@
 //! Errors at the application shell level.
 
 use std::fmt;
-
-use super::util::FromWide;
 use std::ptr::{null, null_mut};
+
 use winapi::shared::minwindef::{DWORD, HLOCAL};
 use winapi::shared::ntdef::LPWSTR;
 use winapi::shared::winerror::HRESULT;
@@ -26,6 +25,8 @@ use winapi::um::winbase::{
     FORMAT_MESSAGE_IGNORE_INSERTS, FORMAT_MESSAGE_MAX_WIDTH_MASK,
 };
 
+use super::util::FromWide;
+
 /// Error codes. At the moment, this is little more than HRESULT, but that
 /// might change.
 #[derive(Debug, Clone)]

druid-shell/src/platform/windows/timers.rs

@@ -14,10 +14,11 @@
 
 //! Timer state.
 
-use crate::window::TimerToken;
 use std::collections::BTreeSet;
 use std::time::Instant;
 
+use crate::window::TimerToken;
+
 pub struct TimerSlots {
     // Note: we can remove this when checked_duration_since lands.
     next_fresh_id: u64,

druid-shell/src/platform/windows/util.rs

@@ -23,6 +23,7 @@ use std::os::windows::ffi::{OsStrExt, OsStringExt};
 use std::ptr;
 use std::slice;
 
+use lazy_static::lazy_static;
 use winapi::ctypes::c_void;
 use winapi::shared::guiddef::REFIID;
 use winapi::shared::minwindef::{HMODULE, UINT};

druid-shell/src/platform/x11/application.rs

@@ -18,6 +18,8 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 use std::sync::Arc;
 
+use lazy_static::lazy_static;
+
 use super::clipboard::Clipboard;
 use super::window::XWindow;
 use crate::application::AppHandler;