Use the correct log crate and setup env_logger in main.

This commit is contained in:
Eduard Burtescu 2015-06-06 23:20:40 +03:00
parent 78665336e6
commit 00e8e5f77d
35 changed files with 95 additions and 16 deletions

View file

@ -33,5 +33,6 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
features = ["texture_surface"] features = ["texture_surface"]
[dependencies] [dependencies]
log = "*"
cssparser = "0.3.1" cssparser = "0.3.1"
num = "0.1.24" num = "0.1.24"

View file

@ -4,7 +4,6 @@
#![feature(core)] #![feature(core)]
#![feature(collections)] #![feature(collections)]
#![feature(rustc_private)]
extern crate canvas_traits; extern crate canvas_traits;
extern crate azure; extern crate azure;

View file

@ -65,6 +65,7 @@ git = "https://github.com/servo/gleam"
git = "https://github.com/servo/rust-x11-clipboard" git = "https://github.com/servo/rust-x11-clipboard"
[dependencies] [dependencies]
log = "*"
num = "0.1.24" num = "0.1.24"
url = "0.2.35" url = "0.2.35"
time = "0.1.17" time = "0.1.17"

View file

@ -5,7 +5,6 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(collections)] #![feature(collections)]
#![feature(core)] #![feature(core)]
#![feature(rustc_private)]
#[macro_use] #[macro_use]
extern crate log; extern crate log;

View file

@ -17,6 +17,7 @@ path = "../msg"
path = "../util" path = "../util"
[dependencies] [dependencies]
log = "*"
time = "*" time = "*"
rustc-serialize = "0.3" rustc-serialize = "0.3"
url = "*" url = "*"

View file

@ -10,7 +10,7 @@
#![crate_name = "devtools"] #![crate_name = "devtools"]
#![crate_type = "rlib"] #![crate_type = "rlib"]
#![feature(box_syntax, core, rustc_private)] #![feature(box_syntax, core)]
#![feature(collections)] #![feature(collections)]
#![allow(non_snake_case)] #![allow(non_snake_case)]

View file

@ -72,6 +72,7 @@ path = "../script_traits"
git = "https://github.com/servo/string-cache" git = "https://github.com/servo/string-cache"
[dependencies] [dependencies]
log = "*"
url = "0.2.35" url = "0.2.35"
time = "0.1.12" time = "0.1.12"
bitflags = "*" bitflags = "*"

View file

@ -8,7 +8,6 @@
#![feature(core)] #![feature(core)]
#![feature(plugin, custom_attribute)] #![feature(plugin, custom_attribute)]
#![feature(custom_derive)] #![feature(custom_derive)]
#![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
#![feature(str_char)] #![feature(str_char)]

View file

@ -68,6 +68,7 @@ git = "https://github.com/servo/rust-png"
git = "https://github.com/tomaka/clock_ticks" git = "https://github.com/tomaka/clock_ticks"
[dependencies] [dependencies]
log = "*"
encoding = "0.2" encoding = "0.2"
url = "0.2.35" url = "0.2.35"
bitflags = "*" bitflags = "*"

View file

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

View file

@ -8,7 +8,6 @@
#![feature(core)] #![feature(core)]
#![feature(filling_drop)] #![feature(filling_drop)]
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
#![feature(str_char)] #![feature(str_char)]
#![feature(thread_local)] #![feature(thread_local)]

View file

@ -23,6 +23,7 @@ git = "https://github.com/servo/rust-geom"
git = "https://github.com/servo/rust-png" git = "https://github.com/servo/rust-png"
[dependencies] [dependencies]
log = "*"
url = "0.2.35" url = "0.2.35"
time = "0.1.17" time = "0.1.17"
openssl="0.6.1" openssl="0.6.1"

View file

@ -193,7 +193,7 @@ reason: \"certificate verify failed\" }]))";
if !req.headers().has::<AcceptEncoding>() { if !req.headers().has::<AcceptEncoding>() {
req.headers_mut().set_raw("Accept-Encoding".to_owned(), vec![b"gzip, deflate".to_vec()]); 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); info!("{}", load_data.method);
for header in req.headers().iter() { for header in req.headers().iter() {
info!(" - {}", header); info!(" - {}", header);
@ -257,7 +257,7 @@ reason: \"certificate verify failed\" }]))";
// Dump headers, but only do the iteration if info!() is enabled. // Dump headers, but only do the iteration if info!() is enabled.
info!("got HTTP response {}, headers:", response.status); info!("got HTTP response {}, headers:", response.status);
if log_enabled!(log::INFO) { if log_enabled!(log::LogLevel::Info) {
for header in response.headers.iter() { for header in response.headers.iter() {
info!(" - {}", header); info!(" - {}", header);
} }

View file

@ -8,7 +8,6 @@
#![feature(core)] #![feature(core)]
#![feature(path_ext)] #![feature(path_ext)]
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
#![plugin(regex_macros)] #![plugin(regex_macros)]

View file

@ -23,5 +23,6 @@ path = "../msg"
git = "https://github.com/servo/rust-stb-image" git = "https://github.com/servo/rust-stb-image"
[dependencies] [dependencies]
log = "*"
url = "0.2.35" url = "0.2.35"
hyper = "0.5" hyper = "0.5"

View file

@ -4,7 +4,6 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(collections)] #![feature(collections)]
#![feature(rustc_private)]
#![feature(slice_patterns)] #![feature(slice_patterns)]
#![feature(step_by)] #![feature(step_by)]

View file

@ -14,6 +14,7 @@ path = "../profile_traits"
path = "../util" path = "../util"
[dependencies] [dependencies]
log = "*"
libc = "*" libc = "*"
regex = "0.1.14" regex = "0.1.14"
time = "0.1.12" time = "0.1.12"

View file

@ -6,7 +6,6 @@
#![feature(collections)] #![feature(collections)]
#![feature(core)] #![feature(core)]
#![cfg_attr(target_os="linux", feature(page_size))] #![cfg_attr(target_os="linux", feature(page_size))]
#![feature(rustc_private)]
#[macro_use] extern crate log; #[macro_use] extern crate log;

View file

@ -74,6 +74,7 @@ features = ["query_encoding"]
git = "https://github.com/ecoal95/rust-offscreen-rendering-context" git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
[dependencies] [dependencies]
log = "*"
encoding = "0.2" encoding = "0.2"
time = "0.1.12" time = "0.1.12"
bitflags = "*" bitflags = "*"

View file

@ -8,7 +8,6 @@
#![feature(core)] #![feature(core)]
#![feature(custom_attribute)] #![feature(custom_attribute)]
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

View file

@ -7,6 +7,7 @@ dependencies = [
"compositing 0.0.1", "compositing 0.0.1",
"devtools 0.0.1", "devtools 0.0.1",
"devtools_traits 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 0.0.1",
"gfx_tests 0.0.1", "gfx_tests 0.0.1",
"glutin_app 0.0.1", "glutin_app 0.0.1",
@ -81,6 +82,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"gleam 0.0.1 (git+https://github.com/servo/gleam)", "gleam 0.0.1 (git+https://github.com/servo/gleam)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "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)", "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)", "offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"util 0.0.1", "util 0.0.1",
@ -140,6 +142,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1", "layout_traits 0.0.1",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
@ -211,6 +214,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" 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]] [[package]]
name = "expat-sys" name = "expat-sys"
version = "2.1.0" version = "2.1.0"
@ -387,6 +400,7 @@ dependencies = [
"harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
@ -658,6 +672,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"layout_traits 0.0.1", "layout_traits 0.0.1",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"plugins 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)", "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "net_traits 0.0.1",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
@ -816,6 +832,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@ -968,6 +985,7 @@ name = "profile"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"libc 0.1.8 (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)",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"task_info 0.0.1", "task_info 0.0.1",
@ -1038,6 +1056,7 @@ dependencies = [
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "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)", "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)", "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)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
@ -1262,6 +1282,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "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)", "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)", "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 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)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
@ -1309,6 +1330,7 @@ dependencies = [
name = "webdriver_server" name = "webdriver_server"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "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)", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",

View file

@ -100,6 +100,7 @@ path = "../../support/android-rs-glue/glue"
optional = true optional = true
[dependencies] [dependencies]
env_logger = "*"
url = "0.2.35" url = "0.2.35"
time = "0.1.12" time = "0.1.12"
bitflags = "*" bitflags = "*"

View file

@ -28,6 +28,7 @@ extern crate util;
// The window backed by glutin // The window backed by glutin
extern crate glutin_app as app; extern crate glutin_app as app;
extern crate time; extern crate time;
extern crate env_logger;
#[cfg(target_os="android")] #[cfg(target_os="android")]
#[macro_use] #[macro_use]
@ -43,6 +44,8 @@ use compositing::windowing::WindowEvent;
use std::borrow::ToOwned; use std::borrow::ToOwned;
fn main() { fn main() {
env_logger::init().unwrap();
// Parse the command line options and store them globally // Parse the command line options and store them globally
if opts::from_cmdline_args(&*get_args()) { if opts::from_cmdline_args(&*get_args()) {
setup_logging(); setup_logging();

View file

@ -28,6 +28,7 @@ git = "https://github.com/servo/string-cache"
git = "https://github.com/servo/string-cache" git = "https://github.com/servo/string-cache"
[dependencies] [dependencies]
log = "*"
encoding = "0.2" encoding = "0.2"
rustc-serialize = "0.3" rustc-serialize = "0.3"
matches = "0.1" matches = "0.1"

View file

@ -8,7 +8,6 @@
#![feature(core)] #![feature(core)]
#![feature(collections)] #![feature(collections)]
#![feature(hash)] #![feature(hash)]
#![feature(rustc_private)]
#![feature(custom_attribute, custom_derive)] #![feature(custom_attribute, custom_derive)]
#![plugin(string_cache_plugin)] #![plugin(string_cache_plugin)]
#![plugin(plugins)] #![plugin(plugins)]

View file

@ -41,7 +41,7 @@ impl<'a> ParserContext<'a> {
/// Set a `RUST_LOG=style::errors` environment variable /// Set a `RUST_LOG=style::errors` environment variable
/// to log CSS parse errors to stderr. /// to log CSS parse errors to stderr.
pub fn log_css_error(input: &mut Parser, position: SourcePosition, message: &str) { 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); let location = input.source_location(position);
// TODO eventually this will got into a "web console" or something. // TODO eventually this will got into a "web console" or something.
info!("{}:{} {}", location.line, location.column, message) info!("{}:{} {}", location.line, location.column, message)

View file

@ -37,6 +37,7 @@ git = "https://github.com/servo/string-cache"
git = "https://github.com/servo/string-cache" git = "https://github.com/servo/string-cache"
[dependencies] [dependencies]
log = "*"
bitflags = "*" bitflags = "*"
libc = "*" libc = "*"
rand = "*" rand = "*"

View file

@ -20,6 +20,7 @@ git = "https://github.com/jgraham/webdriver-rust.git"
git = "https://github.com/servo/rust-png" git = "https://github.com/servo/rust-png"
[dependencies] [dependencies]
log = "*"
rustc-serialize = "0.3.4" rustc-serialize = "0.3.4"
url = "0.2.35" url = "0.2.35"
uuid = "*" uuid = "*"

View file

@ -5,7 +5,7 @@
#![crate_name = "webdriver_server"] #![crate_name = "webdriver_server"]
#![crate_type = "rlib"] #![crate_type = "rlib"]
#![feature(rustc_private, ip_addr)] #![feature(ip_addr)]
#[macro_use] #[macro_use]
extern crate log; extern crate log;

23
ports/cef/Cargo.lock generated
View file

@ -17,6 +17,7 @@ dependencies = [
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",
"objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -80,6 +81,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"gleam 0.0.1 (git+https://github.com/servo/gleam)", "gleam 0.0.1 (git+https://github.com/servo/gleam)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "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)", "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)", "offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"util 0.0.1", "util 0.0.1",
@ -149,6 +151,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1", "layout_traits 0.0.1",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
@ -220,6 +223,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" 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]] [[package]]
name = "expat-sys" name = "expat-sys"
version = "2.1.0" version = "2.1.0"
@ -396,6 +409,7 @@ dependencies = [
"harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
@ -660,6 +674,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"layout_traits 0.0.1", "layout_traits 0.0.1",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"plugins 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)", "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "net_traits 0.0.1",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
@ -806,6 +822,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@ -958,6 +975,7 @@ name = "profile"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"libc 0.1.8 (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)",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"task_info 0.0.1", "task_info 0.0.1",
@ -1028,6 +1046,7 @@ dependencies = [
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1084,6 +1103,7 @@ dependencies = [
"compositing 0.0.1", "compositing 0.0.1",
"devtools 0.0.1", "devtools 0.0.1",
"devtools_traits 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 0.0.1",
"glutin_app 0.0.1", "glutin_app 0.0.1",
"layout 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)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "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)", "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)", "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)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
@ -1255,6 +1276,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "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)", "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)", "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 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)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
@ -1293,6 +1315,7 @@ dependencies = [
name = "webdriver_server" name = "webdriver_server"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "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)", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",

View file

@ -81,6 +81,7 @@ git = "https://github.com/servo/gleam"
git = "https://github.com/servo/rust-cgl" git = "https://github.com/servo/rust-cgl"
[dependencies] [dependencies]
log = "*"
url = "*" url = "*"
libc = "*" libc = "*"
objc = "0.1" objc = "0.1"

View file

@ -10,7 +10,6 @@
#![feature(core)] #![feature(core)]
#![feature(convert)] #![feature(convert)]
#![feature(std_misc)] #![feature(std_misc)]
#![feature(rustc_private)]
#![feature(collections)] #![feature(collections)]
#![feature(negate_unsigned)] #![feature(negate_unsigned)]
#![feature(unicode)] #![feature(unicode)]

23
ports/gonk/Cargo.lock generated
View file

@ -5,6 +5,7 @@ dependencies = [
"compositing 0.0.1", "compositing 0.0.1",
"devtools 0.0.1", "devtools 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)", "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)", "errno 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1", "gfx 0.0.1",
@ -67,6 +68,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"gleam 0.0.1 (git+https://github.com/servo/gleam)", "gleam 0.0.1 (git+https://github.com/servo/gleam)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "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)", "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)", "offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"util 0.0.1", "util 0.0.1",
@ -126,6 +128,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1", "layout_traits 0.0.1",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
@ -197,6 +200,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" 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]] [[package]]
name = "errno" name = "errno"
version = "0.1.2" version = "0.1.2"
@ -375,6 +388,7 @@ dependencies = [
"harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "harfbuzz 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
@ -567,6 +581,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"layout_traits 0.0.1", "layout_traits 0.0.1",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"plugins 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)", "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "net_traits 0.0.1",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
@ -705,6 +721,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "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", "msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@ -839,6 +856,7 @@ name = "profile"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"libc 0.1.8 (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)",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"task_info 0.0.1", "task_info 0.0.1",
@ -909,6 +927,7 @@ dependencies = [
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (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)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
@ -965,6 +984,7 @@ dependencies = [
"compositing 0.0.1", "compositing 0.0.1",
"devtools 0.0.1", "devtools 0.0.1",
"devtools_traits 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 0.0.1",
"layout 0.0.1", "layout 0.0.1",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)", "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)", "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)", "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)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
@ -1117,6 +1138,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "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)", "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)", "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 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)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
@ -1155,6 +1177,7 @@ dependencies = [
name = "webdriver_server" name = "webdriver_server"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "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)", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",

View file

@ -55,6 +55,7 @@ git = "https://github.com/servo/rust-egl"
git = "https://github.com/servo/gleam" git = "https://github.com/servo/gleam"
[dependencies] [dependencies]
env_logger = "*"
url = "0.2.16" url = "0.2.16"
time = "0.1.17" time = "0.1.17"
errno = "*" errno = "*"

View file

@ -39,6 +39,7 @@ extern crate layers;
extern crate egl; extern crate egl;
extern crate url; extern crate url;
extern crate net; extern crate net;
extern crate env_logger;
use util::opts; use util::opts;
use net::resource_task; use net::resource_task;
@ -55,6 +56,8 @@ struct BrowserWrapper {
} }
fn main() { fn main() {
env_logger::init().unwrap();
// Parse the command line options and store them globally // Parse the command line options and store them globally
if opts::from_cmdline_args(env::args().collect::<Vec<_>>().as_slice()) { if opts::from_cmdline_args(env::args().collect::<Vec<_>>().as_slice()) {
resource_task::global_init(); resource_task::global_init();