servo: Merge #6301 - Use the correct log crate and setup env_logger in main (from eddyb:fix-logging-2); r=larsbergstrom

Fixes #6103. Source-Repo: https://github.com/servo/servo Source-Revision: 1587d8a301983b881b038c7e443ba6d1deb1f72f
2015-06-06 15:49:56 -05:00 · 2015-06-06 15:49:56 -05:00 · 1ef27572ef
--- a/servo/components/canvas/Cargo.toml
+++ b/servo/components/canvas/Cargo.toml
@ -33,5 +33,6 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
 features = ["texture_surface"]

 [dependencies]
+log = "*"
 cssparser = "0.3.1"
 num = "0.1.24"
--- a/servo/components/canvas/lib.rs
+++ b/servo/components/canvas/lib.rs
@ -4,7 +4,6 @@

 #![feature(core)]
 #![feature(collections)]
-#![feature(rustc_private)]

 extern crate canvas_traits;
 extern crate azure;
--- a/servo/components/compositing/Cargo.toml
+++ b/servo/components/compositing/Cargo.toml
@ -65,6 +65,7 @@ git = "https://github.com/servo/gleam"
 git = "https://github.com/servo/rust-x11-clipboard"

 [dependencies]
+log = "*"
 num = "0.1.24"
 url = "0.2.35"
 time = "0.1.17"
--- a/servo/components/compositing/lib.rs
+++ b/servo/components/compositing/lib.rs
@ -5,7 +5,6 @@
 #![feature(box_syntax)]
 #![feature(collections)]
 #![feature(core)]
-#![feature(rustc_private)]

 #[macro_use]
 extern crate log;
--- a/servo/components/devtools/Cargo.toml
+++ b/servo/components/devtools/Cargo.toml
@ -17,6 +17,7 @@ path = "../msg"
 path = "../util"

 [dependencies]
+log = "*"
 time = "*"
 rustc-serialize = "0.3"
 url = "*"
--- a/servo/components/devtools/lib.rs
+++ b/servo/components/devtools/lib.rs
@ -10,7 +10,7 @@
 #![crate_name = "devtools"]
 #![crate_type = "rlib"]

-#![feature(box_syntax, core, rustc_private)]
+#![feature(box_syntax, core)]
 #![feature(collections)]

 #![allow(non_snake_case)]
--- a/servo/components/gfx/Cargo.toml
+++ b/servo/components/gfx/Cargo.toml
@ -72,6 +72,7 @@ path = "../script_traits"
 git = "https://github.com/servo/string-cache"

 [dependencies]
+log = "*"
 url = "0.2.35"
 time = "0.1.12"
 bitflags = "*"
--- a/servo/components/gfx/lib.rs
+++ b/servo/components/gfx/lib.rs
@ -8,7 +8,6 @@
 #![feature(core)]
 #![feature(plugin, custom_attribute)]
 #![feature(custom_derive)]
-#![feature(rustc_private)]
 #![feature(std_misc)]
 #![feature(str_char)]

--- a/servo/components/layout/Cargo.toml
+++ b/servo/components/layout/Cargo.toml
@ -68,6 +68,7 @@ git = "https://github.com/servo/rust-png"
 git = "https://github.com/tomaka/clock_ticks"

 [dependencies]
+log = "*"
 encoding = "0.2"
 url = "0.2.35"
 bitflags = "*"
--- a/servo/components/layout/layout_task.rs
+++ b/servo/components/layout/layout_task.rs
@ -889,7 +889,7 @@ impl LayoutTask {
        };

        debug!("layout: received layout request for: {}", self.url.serialize());
-        if log_enabled!(log::DEBUG) {
+        if log_enabled!(log::LogLevel::Debug) {
            node.dump();
        }

--- a/servo/components/layout/lib.rs
+++ b/servo/components/layout/lib.rs
@ -8,7 +8,6 @@
 #![feature(core)]
 #![feature(filling_drop)]
 #![feature(plugin)]
-#![feature(rustc_private)]
 #![feature(std_misc)]
 #![feature(str_char)]
 #![feature(thread_local)]
--- a/servo/components/net/Cargo.toml
+++ b/servo/components/net/Cargo.toml
@ -23,6 +23,7 @@ git = "https://github.com/servo/rust-geom"
 git = "https://github.com/servo/rust-png"

 [dependencies]
+log = "*"
 url = "0.2.35"
 time = "0.1.17"
 openssl="0.6.1"
--- a/servo/components/net/http_loader.rs
+++ b/servo/components/net/http_loader.rs
@ -193,7 +193,7 @@ reason: \"certificate verify failed\" }]))";
        if !req.headers().has::<AcceptEncoding>() {
            req.headers_mut().set_raw("Accept-Encoding".to_owned(), vec![b"gzip, deflate".to_vec()]);
        }
-        if log_enabled!(log::INFO) {
+        if log_enabled!(log::LogLevel::Info) {
            info!("{}", load_data.method);
            for header in req.headers().iter() {
                info!(" - {}", header);
@ -257,7 +257,7 @@ reason: \"certificate verify failed\" }]))";

        // Dump headers, but only do the iteration if info!() is enabled.
        info!("got HTTP response {}, headers:", response.status);
-        if log_enabled!(log::INFO) {
+        if log_enabled!(log::LogLevel::Info) {
            for header in response.headers.iter() {
                info!(" - {}", header);
            }
--- a/servo/components/net/lib.rs
+++ b/servo/components/net/lib.rs
@ -8,7 +8,6 @@
 #![feature(core)]
 #![feature(path_ext)]
 #![feature(plugin)]
-#![feature(rustc_private)]
 #![feature(std_misc)]

 #![plugin(regex_macros)]
--- a/servo/components/net_traits/Cargo.toml
+++ b/servo/components/net_traits/Cargo.toml
@ -23,5 +23,6 @@ path = "../msg"
 git = "https://github.com/servo/rust-stb-image"

 [dependencies]
+log = "*"
 url = "0.2.35"
 hyper = "0.5"
--- a/servo/components/net_traits/lib.rs
+++ b/servo/components/net_traits/lib.rs
@ -4,7 +4,6 @@

 #![feature(box_syntax)]
 #![feature(collections)]
-#![feature(rustc_private)]
 #![feature(slice_patterns)]
 #![feature(step_by)]

--- a/servo/components/profile/Cargo.toml
+++ b/servo/components/profile/Cargo.toml
@ -14,6 +14,7 @@ path = "../profile_traits"
 path = "../util"

 [dependencies]
+log = "*"
 libc = "*"
 regex = "0.1.14"
 time = "0.1.12"
--- a/servo/components/profile/lib.rs
+++ b/servo/components/profile/lib.rs
@ -6,7 +6,6 @@
 #![feature(collections)]
 #![feature(core)]
 #![cfg_attr(target_os="linux", feature(page_size))]
-#![feature(rustc_private)]

 #[macro_use] extern crate log;

--- a/servo/components/script/Cargo.toml
+++ b/servo/components/script/Cargo.toml
@ -74,6 +74,7 @@ features = ["query_encoding"]
 git = "https://github.com/ecoal95/rust-offscreen-rendering-context"

 [dependencies]
+log = "*"
 encoding = "0.2"
 time = "0.1.12"
 bitflags = "*"
--- a/servo/components/script/lib.rs
+++ b/servo/components/script/lib.rs
@ -8,7 +8,6 @@
 #![feature(core)]
 #![feature(custom_attribute)]
 #![feature(plugin)]
-#![feature(rustc_private)]
 #![feature(std_misc)]

 #![deny(unsafe_code)]
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@ -7,6 +7,7 @@ dependencies = [
 "compositing 0.0.1",
 "devtools 0.0.1",
 "devtools_traits 0.0.1",
+ "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "gfx_tests 0.0.1",
 "glutin_app 0.0.1",
@ -81,6 +82,7 @@ dependencies = [
 "gfx_traits 0.0.1",
 "gleam 0.0.1 (git+https://github.com/servo/gleam)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "util 0.0.1",
@ -140,6 +142,7 @@ dependencies = [
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "layout_traits 0.0.1",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net 0.0.1",
 "net_traits 0.0.1",
@ -211,6 +214,7 @@ version = "0.0.1"
 dependencies = [
 "devtools_traits 0.0.1",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@ -296,6 +300,15 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "env_logger"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "expat-sys"
 version = "2.1.0"
@ -387,6 +400,7 @@ dependencies = [
 "harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "plugins 0.0.1",
@ -658,6 +672,7 @@ dependencies = [
 "gfx_traits 0.0.1",
 "layout_traits 0.0.1",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "plugins 0.0.1",
@ -786,6 +801,7 @@ dependencies = [
 "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net_traits 0.0.1",
 "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
@ -816,6 +832,7 @@ version = "0.0.1"
 dependencies = [
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@ -968,6 +985,7 @@ name = "profile"
 version = "0.0.1"
 dependencies = [
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "profile_traits 0.0.1",
 "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
 "task_info 0.0.1",
@ -1038,6 +1056,7 @@ dependencies = [
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1162,6 +1181,7 @@ dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
@ -1262,6 +1282,7 @@ dependencies = [
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
@ -1309,6 +1330,7 @@ dependencies = [
 name = "webdriver_server"
 version = "0.0.1"
 dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/components/servo/Cargo.toml
+++ b/servo/components/servo/Cargo.toml
@ -100,6 +100,7 @@ path = "../../support/android-rs-glue/glue"
 optional = true

 [dependencies]
+env_logger = "*"
 url = "0.2.35"
 time = "0.1.12"
 bitflags = "*"
--- a/servo/components/servo/main.rs
+++ b/servo/components/servo/main.rs
@ -28,6 +28,7 @@ extern crate util;
 // The window backed by glutin
 extern crate glutin_app as app;
 extern crate time;
+extern crate env_logger;

 #[cfg(target_os="android")]
 #[macro_use]
@ -43,6 +44,8 @@ use compositing::windowing::WindowEvent;
 use std::borrow::ToOwned;

 fn main() {
+    env_logger::init().unwrap();
+
    // Parse the command line options and store them globally
    if opts::from_cmdline_args(&*get_args()) {
        setup_logging();
--- a/servo/components/style/Cargo.toml
+++ b/servo/components/style/Cargo.toml
@ -28,6 +28,7 @@ git = "https://github.com/servo/string-cache"
 git = "https://github.com/servo/string-cache"

 [dependencies]
+log = "*"
 encoding = "0.2"
 rustc-serialize = "0.3"
 matches = "0.1"
--- a/servo/components/style/lib.rs
+++ b/servo/components/style/lib.rs
@ -8,7 +8,6 @@
 #![feature(core)]
 #![feature(collections)]
 #![feature(hash)]
-#![feature(rustc_private)]
 #![feature(custom_attribute, custom_derive)]
 #![plugin(string_cache_plugin)]
 #![plugin(plugins)]
--- a/servo/components/style/parser.rs
+++ b/servo/components/style/parser.rs
@ -41,7 +41,7 @@ impl<'a> ParserContext<'a> {
 /// Set a `RUST_LOG=style::errors` environment variable
 /// to log CSS parse errors to stderr.
 pub fn log_css_error(input: &mut Parser, position: SourcePosition, message: &str) {
-    if log_enabled!(log::INFO) {
+    if log_enabled!(log::LogLevel::Info) {
        let location = input.source_location(position);
        // TODO eventually this will got into a "web console" or something.
        info!("{}:{} {}", location.line, location.column, message)
--- a/servo/components/util/Cargo.toml
+++ b/servo/components/util/Cargo.toml
@ -37,6 +37,7 @@ git = "https://github.com/servo/string-cache"
 git = "https://github.com/servo/string-cache"

 [dependencies]
+log = "*"
 bitflags = "*"
 libc = "*"
 rand = "*"
--- a/servo/components/webdriver_server/Cargo.toml
+++ b/servo/components/webdriver_server/Cargo.toml
@ -20,6 +20,7 @@ git = "https://github.com/jgraham/webdriver-rust.git"
 git = "https://github.com/servo/rust-png"

 [dependencies]
+log = "*"
 rustc-serialize = "0.3.4"
 url = "0.2.35"
 uuid = "*"
--- a/servo/components/webdriver_server/lib.rs
+++ b/servo/components/webdriver_server/lib.rs
@ -5,7 +5,7 @@
 #![crate_name = "webdriver_server"]
 #![crate_type = "rlib"]

-#![feature(rustc_private, ip_addr)]
+#![feature(ip_addr)]

 #[macro_use]
 extern crate log;
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@ -17,6 +17,7 @@ dependencies = [
 "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net 0.0.1",
 "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -80,6 +81,7 @@ dependencies = [
 "gfx_traits 0.0.1",
 "gleam 0.0.1 (git+https://github.com/servo/gleam)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "util 0.0.1",
@ -149,6 +151,7 @@ dependencies = [
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "layout_traits 0.0.1",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net 0.0.1",
 "net_traits 0.0.1",
@ -220,6 +223,7 @@ version = "0.0.1"
 dependencies = [
 "devtools_traits 0.0.1",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@ -305,6 +309,15 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "env_logger"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "expat-sys"
 version = "2.1.0"
@ -396,6 +409,7 @@ dependencies = [
 "harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "plugins 0.0.1",
@ -660,6 +674,7 @@ dependencies = [
 "gfx_traits 0.0.1",
 "layout_traits 0.0.1",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "plugins 0.0.1",
@ -788,6 +803,7 @@ dependencies = [
 "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net_traits 0.0.1",
 "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
@ -806,6 +822,7 @@ version = "0.0.1"
 dependencies = [
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@ -958,6 +975,7 @@ name = "profile"
 version = "0.0.1"
 dependencies = [
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "profile_traits 0.0.1",
 "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
 "task_info 0.0.1",
@ -1028,6 +1046,7 @@ dependencies = [
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1084,6 +1103,7 @@ dependencies = [
 "compositing 0.0.1",
 "devtools 0.0.1",
 "devtools_traits 0.0.1",
+ "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "glutin_app 0.0.1",
 "layout 0.0.1",
@ -1169,6 +1189,7 @@ dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
@ -1255,6 +1276,7 @@ dependencies = [
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
@ -1293,6 +1315,7 @@ dependencies = [
 name = "webdriver_server"
 version = "0.0.1"
 dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/ports/cef/Cargo.toml
+++ b/servo/ports/cef/Cargo.toml
@ -81,6 +81,7 @@ git = "https://github.com/servo/gleam"
 git = "https://github.com/servo/rust-cgl"

 [dependencies]
+log = "*"
 url = "*"
 libc = "*"
 objc = "0.1"
--- a/servo/ports/cef/lib.rs
+++ b/servo/ports/cef/lib.rs
@ -10,7 +10,6 @@
 #![feature(core)]
 #![feature(convert)]
 #![feature(std_misc)]
-#![feature(rustc_private)]
 #![feature(collections)]
 #![feature(negate_unsigned)]
 #![feature(unicode)]
--- a/servo/ports/gonk/Cargo.lock
+++ b/servo/ports/gonk/Cargo.lock
@ -5,6 +5,7 @@ dependencies = [
 "compositing 0.0.1",
 "devtools 0.0.1",
 "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
+ "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "errno 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "gfx 0.0.1",
@ -67,6 +68,7 @@ dependencies = [
 "gfx_traits 0.0.1",
 "gleam 0.0.1 (git+https://github.com/servo/gleam)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "util 0.0.1",
@ -126,6 +128,7 @@ dependencies = [
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "layout_traits 0.0.1",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net 0.0.1",
 "net_traits 0.0.1",
@ -197,6 +200,7 @@ version = "0.0.1"
 dependencies = [
 "devtools_traits 0.0.1",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@ -282,6 +286,15 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "env_logger"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "errno"
 version = "0.1.2"
@ -375,6 +388,7 @@ dependencies = [
 "harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "plugins 0.0.1",
@ -567,6 +581,7 @@ dependencies = [
 "gfx_traits 0.0.1",
 "layout_traits 0.0.1",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "plugins 0.0.1",
@ -687,6 +702,7 @@ dependencies = [
 "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net_traits 0.0.1",
 "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
@ -705,6 +721,7 @@ version = "0.0.1"
 dependencies = [
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@ -839,6 +856,7 @@ name = "profile"
 version = "0.0.1"
 dependencies = [
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "profile_traits 0.0.1",
 "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
 "task_info 0.0.1",
@ -909,6 +927,7 @@ dependencies = [
 "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
@ -965,6 +984,7 @@ dependencies = [
 "compositing 0.0.1",
 "devtools 0.0.1",
 "devtools_traits 0.0.1",
+ "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "layout 0.0.1",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1040,6 +1060,7 @@ dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
@ -1117,6 +1138,7 @@ dependencies = [
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
@ -1155,6 +1177,7 @@ dependencies = [
 name = "webdriver_server"
 version = "0.0.1"
 dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/ports/gonk/Cargo.toml
+++ b/servo/ports/gonk/Cargo.toml
@ -55,6 +55,7 @@ git = "https://github.com/servo/rust-egl"
 git = "https://github.com/servo/gleam"

 [dependencies]
+env_logger = "*"
 url = "0.2.16"
 time = "0.1.17"
 errno = "*"
--- a/servo/ports/gonk/src/main.rs
+++ b/servo/ports/gonk/src/main.rs
@ -39,6 +39,7 @@ extern crate layers;
 extern crate egl;
 extern crate url;
 extern crate net;
+extern crate env_logger;

 use util::opts;
 use net::resource_task;
@ -55,6 +56,8 @@ struct BrowserWrapper {
 }

 fn main() {
+    env_logger::init().unwrap();
+
    // Parse the command line options and store them globally
    if opts::from_cmdline_args(env::args().collect::<Vec<_>>().as_slice()) {
        resource_task::global_init();