From 73ba85f3e889fc464ac73a9cda03a90aae547acd Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 8 Aug 2018 23:11:50 +0200 Subject: [PATCH] Work around a rustc regression in macro name resolution https://github.com/rust-lang/rust/issues/53205 --- ports/servo/main.rs | 4 ++++ ports/servo/non_android_main.rs | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/servo/main.rs b/ports/servo/main.rs index 5d9174d9e73..c4cd657d138 100644 --- a/ports/servo/main.rs +++ b/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")] diff --git a/ports/servo/non_android_main.rs b/ports/servo/non_android_main.rs index 82d72557fa4..a8a9b05c298 100644 --- a/ports/servo/non_android_main.rs +++ b/ports/servo/non_android_main.rs @@ -9,7 +9,6 @@ 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")]