nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 05:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #64485 - RalfJung:miri, r=alexcrichton

Browse Source 
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.
This commit is contained in:
Mazdak Farrokhzad 2019-09-16 23:21:49 +02:00 committed by GitHub
commit a31d71f56b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.lock
View File

@ -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",

2
src/librustc/Cargo.toml
View File

@ -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"] }

2
src/librustc_mir/Cargo.toml
View File

@ -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"] }

2
src/tools/miri

@ -1 +1 @@
Subproject commit dd94c7c5a32be2ee0adeeaf9d46f26f14925797c
Subproject commit d88138723780d11ca2c09560111223dc20b9d5f3

1
src/tools/rustc-workspace-hack/Cargo.toml
View File

@ -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]