Skip to content

Commit

Permalink
Auto merge of #65982 - RalfJung:miri, r=alexcrichton
Browse files Browse the repository at this point in the history
update miri

As a side-effect, this bumps env_logger from 0.7.0 to 0.7.1.

Fixes #65889
  • Loading branch information
bors committed Oct 31, 2019
2 parents 2f16be4 + 9cd1ede commit b3a0350
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ dependencies = [
"crypto-hash",
"curl",
"curl-sys",
"env_logger 0.7.0",
"env_logger 0.7.1",
"failure",
"filetime",
"flate2",
Expand Down Expand Up @@ -552,7 +552,7 @@ name = "compiletest"
version = "0.0.0"
dependencies = [
"diff",
"env_logger 0.7.0",
"env_logger 0.7.1",
"getopts",
"lazy_static 1.3.0",
"libc",
Expand Down Expand Up @@ -974,9 +974,9 @@ dependencies = [

[[package]]
name = "env_logger"
version = "0.7.0"
version = "0.7.1"
source = "registry+https:/rust-lang/crates.io-index"
checksum = "39ecdb7dd54465526f0a56d666e3b2dd5f3a218665a030b6e4ad9e70fa95d8fa"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [
"atty",
"humantime",
Expand Down Expand Up @@ -2147,13 +2147,13 @@ name = "miri"
version = "0.1.0"
dependencies = [
"byteorder",
"cargo_metadata 0.8.0",
"cargo_metadata 0.9.0",
"colored",
"compiletest_rs",
"directories",
"env_logger 0.6.2",
"env_logger 0.7.1",
"getrandom",
"hex 0.3.2",
"hex 0.4.0",
"log",
"num-traits",
"rand 0.7.0",
Expand Down Expand Up @@ -2981,7 +2981,7 @@ dependencies = [
"clippy_lints",
"crossbeam-channel",
"difference",
"env_logger 0.7.0",
"env_logger 0.7.1",
"failure",
"futures",
"heck",
Expand Down Expand Up @@ -3064,7 +3064,7 @@ name = "rls-rustc"
version = "0.6.0"
dependencies = [
"clippy_lints",
"env_logger 0.7.0",
"env_logger 0.7.1",
"failure",
"futures",
"log",
Expand Down Expand Up @@ -3490,7 +3490,7 @@ dependencies = [
name = "rustc_driver"
version = "0.0.0"
dependencies = [
"env_logger 0.7.0",
"env_logger 0.7.1",
"graphviz",
"lazy_static 1.3.0",
"log",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri

0 comments on commit b3a0350

Please sign in to comment.