servo: Merge #11033 - Set max log level on all platforms (from mbrubeck:max-log); r=metajack

marco-c · marco-c · commit e17a2d009faa · 2019-10-01T00:51:55.000Z
Servo currently enabled the `release_max_level_info` feature for the log crate in an Android-specific dependency. Currently this works for all platforms because of rust-lang/cargo#2524, but it might break if that issue is fixed. Source-Repo: https://github.com/servo/servo Source-Revision: ab12d8098fcc0517b64643d25683e2e15e665410 UltraBlame original commit: e1ac9162c087971de3a15094972cd44a45378bf5
diff --git a/servo/components/servo/Cargo.toml b/servo/components/servo/Cargo.toml
@@ -97,6 +97,20 @@ glutin_app
 "
 webdriver
 "
+"
+max_log_level
+"
+]
+max_log_level
+=
+[
+"
+env_logger
+/
+log
+/
+release_max_level_info
+"
 ]
 webdriver
 =
@@ -805,22 +819,11 @@ dependencies
 ]
 log
 =
-{
-version
-=
 "
 0
 .
 3
 "
-features
-=
-[
-"
-release_max_level_info
-"
-]
-}
 [
 target
 .

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,20 @@ glutin_app`
`97`	`97`	`"`
`98`	`98`	`webdriver`
`99`	`99`	`"`
	`100`	`+"`
	`101`	`+max_log_level`
	`102`	`+"`
	`103`	`+]`
	`104`	`+max_log_level`
	`105`	`+=`
	`106`	`+[`
	`107`	`+"`
	`108`	`+env_logger`
	`109`	`+/`
	`110`	`+log`
	`111`	`+/`
	`112`	`+release_max_level_info`
	`113`	`+"`
`100`	`114`	`]`
`101`	`115`	`webdriver`
`102`	`116`	`=`
`@@ -805,22 +819,11 @@ dependencies`
`805`	`819`	`]`
`806`	`820`	`log`
`807`	`821`	`=`
`808`		`-{`
`809`		`-version`
`810`		`-=`
`811`	`822`	`"`
`812`	`823`	`0`
`813`	`824`	`.`
`814`	`825`	`3`
`815`	`826`	`"`
`816`		`-features`
`817`		`-=`
`818`		`-[`
`819`		`-"`
`820`		`-release_max_level_info`
`821`		`-"`
`822`		`-]`
`823`		`-}`
`824`	`827`	`[`
`825`	`828`	`target`
`826`	`829`	`.`