diff options
35 files changed, 95 insertions, 16 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index fd0072cb29e..1d614316ab5 100644 --- a/components/canvas/Cargo.toml +++ b/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" diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs index 962231581ef..3cfe0b606e4 100644 --- a/components/canvas/lib.rs +++ b/components/canvas/lib.rs @@ -4,7 +4,6 @@ #![feature(core)] #![feature(collections)] -#![feature(rustc_private)] extern crate canvas_traits; extern crate azure; diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index be8d910594e..7c244dd3334 100644 --- a/components/compositing/Cargo.toml +++ b/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" diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 785a594aed9..cc68de34461 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -5,7 +5,6 @@ #![feature(box_syntax)] #![feature(collections)] #![feature(core)] -#![feature(rustc_private)] #[macro_use] extern crate log; diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 08e65063181..27686ca05ae 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -17,6 +17,7 @@ path = "../msg" path = "../util" [dependencies] +log = "*" time = "*" rustc-serialize = "0.3" url = "*" diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 084a9e0158c..24def5fe21c 100644 --- a/components/devtools/lib.rs +++ b/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)] diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 94ba8c12c3b..882ed57833d 100644 --- a/components/gfx/Cargo.toml +++ b/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 = "*" diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 90d3d8ca962..561d8b0ccd2 100644 --- a/components/gfx/lib.rs +++ b/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)] diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 205cbd341cb..7209aa4349d 100644 --- a/components/layout/Cargo.toml +++ b/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 = "*" diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index c12940904c3..59cdbf6bca0 100644 --- a/components/layout/layout_task.rs +++ b/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(); } diff --git a/components/layout/lib.rs b/components/layout/lib.rs index ec4bcbe0a85..66ba28c5523 100644 --- a/components/layout/lib.rs +++ b/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)] diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 5225d45822b..1b3d96b8771 100644 --- a/components/net/Cargo.toml +++ b/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" diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 661554c69ca..65f9f335844 100644 --- a/components/net/http_loader.rs +++ b/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); } diff --git a/components/net/lib.rs b/components/net/lib.rs index 6e845bbff0a..a69787276a1 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -8,7 +8,6 @@ #![feature(core)] #![feature(path_ext)] #![feature(plugin)] -#![feature(rustc_private)] #![feature(std_misc)] #![plugin(regex_macros)] diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index d2f0d363cb8..1500ef4f406 100644 --- a/components/net_traits/Cargo.toml +++ b/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" diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index afbb6d0b5c8..5c6a0cd9df8 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -4,7 +4,6 @@ #![feature(box_syntax)] #![feature(collections)] -#![feature(rustc_private)] #![feature(slice_patterns)] #![feature(step_by)] diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index 05900ad7dbc..ec4017f2a56 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -14,6 +14,7 @@ path = "../profile_traits" path = "../util" [dependencies] +log = "*" libc = "*" regex = "0.1.14" time = "0.1.12" diff --git a/components/profile/lib.rs b/components/profile/lib.rs index ab60d36f86e..93665b440f9 100644 --- a/components/profile/lib.rs +++ b/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; diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 3f4a5c132be..b86d19a7d98 100644 --- a/components/script/Cargo.toml +++ b/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 = "*" diff --git a/components/script/lib.rs b/components/script/lib.rs index 46e50c66ddb..377be0b4e07 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -8,7 +8,6 @@ #![feature(core)] #![feature(custom_attribute)] #![feature(plugin)] -#![feature(rustc_private)] #![feature(std_misc)] #![deny(unsafe_code)] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 7b470df0085..6d31250f637 100644 --- a/components/servo/Cargo.lock +++ b/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)", @@ -297,6 +301,15 @@ 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" source = "git+https://github.com/servo/libexpat#83f914d964af73ba38aa413455a2009cc6cb2618" @@ -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)", diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 93d351ccdac..43bed7d2c8e 100644 --- a/components/servo/Cargo.toml +++ b/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 = "*" diff --git a/components/servo/main.rs b/components/servo/main.rs index ef12ef2171a..5ffc75d911f 100644 --- a/components/servo/main.rs +++ b/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(); diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 7455d321315..cac28148dc8 100644 --- a/components/style/Cargo.toml +++ b/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" diff --git a/components/style/lib.rs b/components/style/lib.rs index 7fa25ac8fad..31d55f708be 100644 --- a/components/style/lib.rs +++ b/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)] diff --git a/components/style/parser.rs b/components/style/parser.rs index 0e3ea92db52..3236d6871cd 100644 --- a/components/style/parser.rs +++ b/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) diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 1ac5eff1354..3256013eb1f 100644 --- a/components/util/Cargo.toml +++ b/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 = "*" diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index dfab4772f15..0a682258501 100644 --- a/components/webdriver_server/Cargo.toml +++ b/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 = "*" diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 73774626cc0..234d1764ab2 100644 --- a/components/webdriver_server/lib.rs +++ b/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; diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index fa78998309e..5cebe050cbc 100644 --- a/ports/cef/Cargo.lock +++ b/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)", @@ -306,6 +310,15 @@ 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" source = "git+https://github.com/servo/libexpat#83f914d964af73ba38aa413455a2009cc6cb2618" @@ -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)", diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index 397dece478e..8410848c3ad 100644 --- a/ports/cef/Cargo.toml +++ b/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" diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs index bc26e01b3a3..59e018100c3 100644 --- a/ports/cef/lib.rs +++ b/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)] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index b1256e4f9f5..fa07a9a584e 100644 --- a/ports/gonk/Cargo.lock +++ b/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)", @@ -283,6 +287,15 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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)", diff --git a/ports/gonk/Cargo.toml b/ports/gonk/Cargo.toml index cf681e7edf7..9076e215dd0 100644 --- a/ports/gonk/Cargo.toml +++ b/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 = "*" diff --git a/ports/gonk/src/main.rs b/ports/gonk/src/main.rs index f8324d531fc..7e13bb71e5e 100644 --- a/ports/gonk/src/main.rs +++ b/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(); |