Skip to content

Commit 11580d9

Browse files
authored
Rollup merge of rust-lang#89536 - RalfJung:miri, r=RalfJung
update Miri Let's get the recent fixes and improvements shipped. r? `@ghost`
2 parents d66533a + e5d0178 commit 11580d9

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

Cargo.lock

+14-18
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ version = "0.1.0"
360360
dependencies = [
361361
"directories",
362362
"rustc-workspace-hack",
363-
"rustc_version",
363+
"rustc_version 0.3.3",
364364
"serde",
365365
"serde_json",
366366
"vergen",
@@ -1092,19 +1092,6 @@ dependencies = [
10921092
"termcolor",
10931093
]
10941094

1095-
[[package]]
1096-
name = "env_logger"
1097-
version = "0.8.1"
1098-
source = "registry+https://github.com/rust-lang/crates.io-index"
1099-
checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd"
1100-
dependencies = [
1101-
"atty",
1102-
"humantime 2.0.1",
1103-
"log",
1104-
"regex",
1105-
"termcolor",
1106-
]
1107-
11081095
[[package]]
11091096
name = "env_logger"
11101097
version = "0.9.0"
@@ -2254,15 +2241,15 @@ version = "0.1.0"
22542241
dependencies = [
22552242
"colored",
22562243
"compiletest_rs",
2257-
"env_logger 0.8.1",
2244+
"env_logger 0.9.0",
22582245
"getrandom 0.2.0",
22592246
"hex 0.4.2",
22602247
"libc",
22612248
"log",
22622249
"measureme",
22632250
"rand 0.8.4",
22642251
"rustc-workspace-hack",
2265-
"rustc_version",
2252+
"rustc_version 0.4.0",
22662253
"shell-escape",
22672254
"smallvec",
22682255
]
@@ -4552,6 +4539,15 @@ dependencies = [
45524539
"semver 0.11.0",
45534540
]
45544541

4542+
[[package]]
4543+
name = "rustc_version"
4544+
version = "0.4.0"
4545+
source = "registry+https://github.com/rust-lang/crates.io-index"
4546+
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
4547+
dependencies = [
4548+
"semver 1.0.3",
4549+
]
4550+
45554551
[[package]]
45564552
name = "rustdoc"
45574553
version = "0.0.0"
@@ -4912,9 +4908,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
49124908

49134909
[[package]]
49144910
name = "smallvec"
4915-
version = "1.6.1"
4911+
version = "1.7.0"
49164912
source = "registry+https://github.com/rust-lang/crates.io-index"
4917-
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
4913+
checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
49184914

49194915
[[package]]
49204916
name = "snap"

0 commit comments

Comments
 (0)