diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-16 23:21:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 23:21:49 +0200 |
| commit | a31d71f56b31fa2273acaae148280ad6dc4160c9 (patch) | |
| tree | a638a5257d90d320d05054d0baf75b7aad30ec9e | |
| parent | 88e501e7684e3c31e6232cbb58c55e1d7c123524 (diff) | |
| parent | b7ebbc291a6304488eac6b13d5656d6981728551 (diff) | |
Rollup merge of #64485 - RalfJung:miri, r=alexcrichton
update Miri Fixes https://github.com/rust-lang/rust/issues/64363 r? @alexcrichton for the Cargo.toml changes: with byteorder 1.3, the `i128` feature is a NOP, so we can remove it everywhere and then get rid of this crate in the workspace-hack.
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | src/librustc/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/librustc_mir/Cargo.toml | 2 | ||||
| m--------- | src/tools/miri | 16 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 1 |
5 files changed, 14 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock index 77e2ce07dbc..0fe31384274 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,9 +234,9 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.2.7" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" +checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" [[package]] name = "bytes" @@ -2067,7 +2067,7 @@ dependencies = [ "hex", "log", "num-traits", - "rand 0.6.1", + "rand 0.7.0", "rustc-workspace-hack", "rustc_version", "shell-escape", @@ -3255,7 +3255,6 @@ dependencies = [ name = "rustc-workspace-hack" version = "1.0.0" dependencies = [ - "byteorder", "crossbeam-utils 0.6.5", "serde", "serde_json", diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml index d569573a5e9..0834faf1324 100644 --- a/src/librustc/Cargo.toml +++ b/src/librustc/Cargo.toml @@ -31,7 +31,7 @@ syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } backtrace = "0.3.3" parking_lot = "0.9" -byteorder = { version = "1.1", features = ["i128"]} +byteorder = { version = "1.3" } chalk-engine = { version = "0.9.0", default-features=false } rustc_fs_util = { path = "../librustc_fs_util" } smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml index e02736078b5..0691390bead 100644 --- a/src/librustc_mir/Cargo.toml +++ b/src/librustc_mir/Cargo.toml @@ -24,6 +24,6 @@ rustc_lexer = { path = "../librustc_lexer" } rustc_serialize = { path = "../libserialize", package = "serialize" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } -byteorder = { version = "1.1", features = ["i128"] } +byteorder = { version = "1.3" } rustc_apfloat = { path = "../librustc_apfloat" } smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } diff --git a/src/tools/miri b/src/tools/miri -Subproject dd94c7c5a32be2ee0adeeaf9d46f26f14925797 +Subproject d88138723780d11ca2c09560111223dc20b9d5f diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index d068e1cf307..930279c0ca2 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -62,7 +62,6 @@ crossbeam-utils = { version = "0.6.5", features = ["nightly"] } serde = { version = "1.0.82", features = ['derive'] } serde_json = { version = "1.0.31", features = ["raw_value"] } smallvec = { version = "0.6", features = ['union', 'may_dangle'] } -byteorder = { version = "1.2.7", features = ["i128"] } [target.'cfg(not(windows))'.dependencies] |