Skip to content

Commit a31d71f

Browse files
authored
Rollup merge of #64485 - RalfJung:miri, r=alexcrichton
update Miri Fixes #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.
2 parents 88e501e + b7ebbc2 commit a31d71f

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

Cargo.lock

+3-4
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ dependencies = [
234234

235235
[[package]]
236236
name = "byteorder"
237-
version = "1.2.7"
237+
version = "1.3.2"
238238
source = "registry+https://github.com/rust-lang/crates.io-index"
239-
checksum = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
239+
checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
240240

241241
[[package]]
242242
name = "bytes"
@@ -2067,7 +2067,7 @@ dependencies = [
20672067
"hex",
20682068
"log",
20692069
"num-traits",
2070-
"rand 0.6.1",
2070+
"rand 0.7.0",
20712071
"rustc-workspace-hack",
20722072
"rustc_version",
20732073
"shell-escape",
@@ -3255,7 +3255,6 @@ dependencies = [
32553255
name = "rustc-workspace-hack"
32563256
version = "1.0.0"
32573257
dependencies = [
3258-
"byteorder",
32593258
"crossbeam-utils 0.6.5",
32603259
"serde",
32613260
"serde_json",

src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ syntax = { path = "../libsyntax" }
3131
syntax_pos = { path = "../libsyntax_pos" }
3232
backtrace = "0.3.3"
3333
parking_lot = "0.9"
34-
byteorder = { version = "1.1", features = ["i128"]}
34+
byteorder = { version = "1.3" }
3535
chalk-engine = { version = "0.9.0", default-features=false }
3636
rustc_fs_util = { path = "../librustc_fs_util" }
3737
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }

src/librustc_mir/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ rustc_lexer = { path = "../librustc_lexer" }
2424
rustc_serialize = { path = "../libserialize", package = "serialize" }
2525
syntax = { path = "../libsyntax" }
2626
syntax_pos = { path = "../libsyntax_pos" }
27-
byteorder = { version = "1.1", features = ["i128"] }
27+
byteorder = { version = "1.3" }
2828
rustc_apfloat = { path = "../librustc_apfloat" }
2929
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }

src/tools/rustc-workspace-hack/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ crossbeam-utils = { version = "0.6.5", features = ["nightly"] }
6262
serde = { version = "1.0.82", features = ['derive'] }
6363
serde_json = { version = "1.0.31", features = ["raw_value"] }
6464
smallvec = { version = "0.6", features = ['union', 'may_dangle'] }
65-
byteorder = { version = "1.2.7", features = ["i128"] }
6665

6766

6867
[target.'cfg(not(windows))'.dependencies]

0 commit comments

Comments
 (0)