Auto merge of #21367 - servo:rustup, r=mbrubeck

Work around a rustc regression in macro name resolution

rust-lang/rust#53205

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21367)
<!-- Reviewable:end -->

Author: bors-servo

ports/servo/main.rs

@@ -17,6 +17,10 @@
 
 #![cfg_attr(feature = "unstable", feature(core_intrinsics))]
 
+// Have this here rather than in non_android_main.rs to work around
+// https://github.com/rust-lang/rust/issues/53205
+#[cfg(not(target_os = "android"))] #[macro_use] extern crate log;
+
 #[cfg(not(target_os = "android"))] include!("non_android_main.rs");
 
 #[cfg(target_os = "android")]

ports/servo/non_android_main.rs

@@ -8,8 +8,6 @@ extern crate euclid;
 extern crate gleam;
 extern crate glutin;
 #[macro_use] extern crate lazy_static;
-// The window backed by glutin
-#[macro_use] extern crate log;
 #[cfg(any(target_os = "linux", target_os = "macos"))] extern crate osmesa_sys;
 extern crate servo;
 #[cfg(feature = "unstable")]
@@ -21,9 +19,13 @@ extern crate winit;
 #[cfg(target_os = "windows")] extern crate winapi;
 #[cfg(target_os = "windows")] extern crate user32;
 
+// The window backed by glutin
 mod glutin_app;
+
 mod resources;
 
+mod browser;
+
 use backtrace::Backtrace;
 use servo::Servo;
 use servo::compositing::windowing::WindowEvent;
@@ -37,8 +39,6 @@ use std::panic;
 use std::process;
 use std::thread;
 
-mod browser;
-
 pub mod platform {
     #[cfg(target_os = "macos")]
     pub use platform::macos::deinit;