Skip to content

Commit 1a67cb4

Browse files
authored
Rollup merge of #64235 - mati865:env_logger, r=alexcrichton
Upgrade env_logger to 0.6
2 parents ea2851e + 8ddbe76 commit 1a67cb4

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

Cargo.lock

+12-24
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ dependencies = [
277277
"crypto-hash",
278278
"curl",
279279
"curl-sys",
280-
"env_logger 0.6.0",
280+
"env_logger",
281281
"failure",
282282
"filetime",
283283
"flate2",
@@ -507,7 +507,7 @@ name = "compiletest"
507507
version = "0.0.0"
508508
dependencies = [
509509
"diff",
510-
"env_logger 0.5.13",
510+
"env_logger",
511511
"getopts",
512512
"lazy_static 1.3.0",
513513
"libc",
@@ -909,21 +909,9 @@ dependencies = [
909909

910910
[[package]]
911911
name = "env_logger"
912-
version = "0.5.13"
913-
source = "registry+https://github.com/rust-lang/crates.io-index"
914-
checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
915-
dependencies = [
916-
"atty",
917-
"humantime",
918-
"log",
919-
"termcolor",
920-
]
921-
922-
[[package]]
923-
name = "env_logger"
924-
version = "0.6.0"
912+
version = "0.6.2"
925913
source = "registry+https://github.com/rust-lang/crates.io-index"
926-
checksum = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e"
914+
checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
927915
dependencies = [
928916
"atty",
929917
"humantime",
@@ -1774,7 +1762,7 @@ dependencies = [
17741762
"chrono",
17751763
"clap",
17761764
"elasticlunr-rs",
1777-
"env_logger 0.6.0",
1765+
"env_logger",
17781766
"error-chain",
17791767
"handlebars",
17801768
"itertools 0.8.0",
@@ -1799,7 +1787,7 @@ version = "0.3.0"
17991787
source = "registry+https://github.com/rust-lang/crates.io-index"
18001788
checksum = "77d1f0ba4d1e6b86fa18e8853d026d7d76a97eb7eb5eb052ed80901e43b7fc10"
18011789
dependencies = [
1802-
"env_logger 0.6.0",
1790+
"env_logger",
18031791
"failure",
18041792
"log",
18051793
"mdbook",
@@ -1992,7 +1980,7 @@ dependencies = [
19921980
"colored",
19931981
"compiletest_rs",
19941982
"directories",
1995-
"env_logger 0.6.0",
1983+
"env_logger",
19961984
"getrandom",
19971985
"hex",
19981986
"log",
@@ -2363,7 +2351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
23632351
checksum = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
23642352
dependencies = [
23652353
"chrono",
2366-
"env_logger 0.6.0",
2354+
"env_logger",
23672355
"log",
23682356
]
23692357

@@ -2440,7 +2428,7 @@ dependencies = [
24402428
"bitflags",
24412429
"clap",
24422430
"derive_more",
2443-
"env_logger 0.6.0",
2431+
"env_logger",
24442432
"humantime",
24452433
"lazy_static 1.3.0",
24462434
"log",
@@ -2734,7 +2722,7 @@ dependencies = [
27342722
"clippy_lints",
27352723
"crossbeam-channel",
27362724
"difference",
2737-
"env_logger 0.6.0",
2725+
"env_logger",
27382726
"failure",
27392727
"futures",
27402728
"heck",
@@ -3203,7 +3191,7 @@ dependencies = [
32033191
name = "rustc_driver"
32043192
version = "0.0.0"
32053193
dependencies = [
3206-
"env_logger 0.5.13",
3194+
"env_logger",
32073195
"graphviz",
32083196
"log",
32093197
"rustc",
@@ -3590,7 +3578,7 @@ dependencies = [
35903578
"derive-new",
35913579
"diff",
35923580
"dirs",
3593-
"env_logger 0.6.0",
3581+
"env_logger",
35943582
"failure",
35953583
"getopts",
35963584
"ignore",

src/librustc_driver/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ crate-type = ["dylib"]
1212
[dependencies]
1313
graphviz = { path = "../libgraphviz" }
1414
log = "0.4"
15-
env_logger = { version = "0.5", default-features = false }
15+
env_logger = { version = "0.6", default-features = false }
1616
rustc = { path = "../librustc" }
1717
rustc_target = { path = "../librustc_target" }
1818
rustc_ast_borrowck = { path = "../librustc_ast_borrowck" }

src/tools/compiletest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66

77
[dependencies]
88
diff = "0.1.10"
9-
env_logger = { version = "0.5", default-features = false }
9+
env_logger = { version = "0.6", default-features = false }
1010
getopts = "0.2"
1111
log = "0.4"
1212
regex = "1.0"

0 commit comments

Comments
 (0)