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};