Skip to content

Commit

Permalink
Rollup merge of rust-lang#64847 - mati865:env_logger, r=alexcrichton
Browse files Browse the repository at this point in the history
Upgrade env_logger to 0.7

`./x.py test` passed locally.
  • Loading branch information
Centril authored Sep 28, 2019
2 parents 63bf25d + 3e4f582 commit 92f6615
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ name = "compiletest"
version = "0.0.0"
dependencies = [
"diff",
"env_logger 0.6.2",
"env_logger 0.7.0",
"getopts",
"lazy_static 1.3.0",
"libc",
Expand Down Expand Up @@ -3409,7 +3409,7 @@ dependencies = [
name = "rustc_driver"
version = "0.0.0"
dependencies = [
"env_logger 0.6.2",
"env_logger 0.7.0",
"graphviz",
"lazy_static 1.3.0",
"log",
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["dylib"]
graphviz = { path = "../libgraphviz" }
lazy_static = "1.0"
log = "0.4"
env_logger = { version = "0.6", default-features = false }
env_logger = { version = "0.7", default-features = false }
rustc = { path = "../librustc" }
rustc_target = { path = "../librustc_target" }
rustc_data_structures = { path = "../librustc_data_structures" }
Expand Down
2 changes: 1 addition & 1 deletion src/tools/compiletest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
diff = "0.1.10"
env_logger = { version = "0.6", default-features = false }
env_logger = { version = "0.7", default-features = false }
getopts = "0.2"
log = "0.4"
regex = "1.0"
Expand Down

0 comments on commit 92f6615

Please sign in to comment.