Auto merge of #9988 - Ms2ger:lazy-static-host-table, r=Manishearth

Use lazy_static for HOST_TABLE.

This might change behaviour if the file is changed between Servo startup and
the moment HOST_TABLE is first accessed. I don't think we care.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9988)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-15 16:33:03 +05:30
commit 183772583f
9 changed files with 45 additions and 56 deletions

1
ports/cef/Cargo.lock generated
View file

@ -1226,6 +1226,7 @@ dependencies = [
"hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"plugins 0.0.1",

1
ports/gonk/Cargo.lock generated
View file

@ -1208,6 +1208,7 @@ dependencies = [
"hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"plugins 0.0.1",

View file

@ -44,7 +44,6 @@ extern crate util;
extern {}
use compositing::windowing::WindowEvent;
use net_traits::hosts;
use servo::Browser;
use std::env;
use util::opts;
@ -62,8 +61,6 @@ fn main() {
// Parse the command line options and store them globally
opts::from_cmdline_args(env::args().collect::<Vec<_>>().as_slice());
hosts::global_init();
let window = if opts::get().headless {
None
} else {