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

Bump env_logger to 0.5 and log to 0.4 in every servo crate

Browse source
This commit is contained in:
Bastien Orivel 2018-03-28 19:50:58 +02:00
parent 84513d43ba
commit 0918ac8cc7
34 changed files with 153 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/geckolib/Cargo.toml
View file

@ -17,9 +17,9 @@ gecko_debug = ["style/gecko_debug"]
atomic_refcell = "0.1"
cssparser = "0.23.0"
cstr = "0.1.2"
env_logger = {version = "0.4", default-features = false} # disable `regex` to reduce code size
env_logger = {version = "0.5", default-features = false} # disable `regex` to reduce code size
libc = "0.2"
log = {version = "0.3.5", features = ["release_max_level_info"]}
log = {version = "0.4", features = ["release_max_level_info"]}
malloc_size_of = {path = "../../components/malloc_size_of"}
nsstring = {path = "../../support/gecko/nsstring"}
parking_lot = "0.5"

8
ports/geckolib/glue.rs
View file

@ -4,7 +4,7 @@
use cssparser::{ParseErrorKind, Parser, ParserInput};
use cssparser::ToCss as ParserToCss;
use env_logger::LogBuilder;
use env_logger::Builder;
use malloc_size_of::MallocSizeOfOps;
use selectors::NthIndexCache;
use selectors::matching::{MatchingContext, MatchingMode, matches_selector};
@ -180,11 +180,11 @@ pub extern "C" fn Servo_Initialize(dummy_url_data: *mut URLExtraData) {
use style::gecko_bindings::sugar::origin_flags;
// Initialize logging.
let mut builder = LogBuilder::new();
let mut builder = Builder::new();
let default_level = if cfg!(debug_assertions) { "warn" } else { "error" };
match env::var("RUST_LOG") {
Ok(v) => builder.parse(&v).init().unwrap(),
_ => builder.parse(default_level).init().unwrap(),
Ok(v) => builder.parse(&v).init(),
_ => builder.parse(default_level).init(),
};
// Pretend that we're a Servo Layout thread, to make some assertions happy.

4
ports/geckolib/tests/Cargo.toml
View file

@ -15,11 +15,11 @@ doctest = false
atomic_refcell = "0.1"
cssparser = "0.23.0"
cstr = "0.1.2"
env_logger = { version = "0.4", default-features = false }
env_logger = { version = "0.5", default-features = false }
euclid = "0.17"
geckoservo = {path = "../../../ports/geckolib"}
libc = "0.2"
log = {version = "0.3.5", features = ["release_max_level_info"]}
log = {version = "0.4", features = ["release_max_level_info"]}
malloc_size_of = {path = "../../../components/malloc_size_of"}
selectors = {path = "../../../components/selectors"}
size_of_test = {path = "../../../components/size_of_test"}

2
ports/servo/Cargo.toml
View file

@ -41,7 +41,7 @@ euclid = "0.17"
gleam = "0.4.29"
glutin = "0.13"
libservo = {path = "../../components/servo"}
log = "0.3.5"
log = "0.4"
msg = {path = "../../components/msg"}
script_traits = {path = "../../components/script_traits"}
servo_geometry = {path = "../../components/geometry"}