Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Work around a rustc regression in macro name resolution

https://github.com/rust-lang/rust/issues/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 -->
This commit is contained in:
bors-servo 2018-08-09 13:34:45 -04:00 • committed by GitHub
commit 0b35a67260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/servo/main.rs
View file

@ -17,6 +17,10 @@
#![cfg_attr(feature = "unstable", feature(core_intrinsics))] #![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(not(target_os = "android"))] include!("non_android_main.rs");
#[cfg(target_os = "android")] #[cfg(target_os = "android")]

8
ports/servo/non_android_main.rs
View file

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