Skip to content

Commit 534a41a

Browse files
committed
Auto merge of rust-lang#71173 - RalfJung:miri, r=RalfJung
bump Miri Fixes rust-lang#71110 r? @ghost Cc @rust-lang/miri
2 parents be895b2 + 7fa2907 commit 534a41a

File tree

2 files changed

+6
-40
lines changed

2 files changed

+6
-40
lines changed

Cargo.lock

+5-39
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ dependencies = [
334334
"pretty_env_logger",
335335
"remove_dir_all",
336336
"rustc-workspace-hack",
337-
"rustfix 0.5.0",
337+
"rustfix",
338338
"same-file",
339339
"semver",
340340
"serde",
@@ -463,7 +463,7 @@ dependencies = [
463463
"cargo_metadata 0.9.1",
464464
"clippy-mini-macro-test",
465465
"clippy_lints",
466-
"compiletest_rs 0.5.0",
466+
"compiletest_rs",
467467
"derive-new",
468468
"lazy_static 1.4.0",
469469
"regex",
@@ -585,35 +585,13 @@ dependencies = [
585585
"log",
586586
"miow 0.3.3",
587587
"regex",
588-
"rustfix 0.5.0",
588+
"rustfix",
589589
"serde",
590590
"serde_json",
591591
"walkdir",
592592
"winapi 0.3.8",
593593
]
594594

595-
[[package]]
596-
name = "compiletest_rs"
597-
version = "0.4.0"
598-
source = "registry+https://github.com/rust-lang/crates.io-index"
599-
checksum = "d7b678957210a00ba0fbeacc23d38cbfbf29895564da1616564634351e1dac5e"
600-
dependencies = [
601-
"diff",
602-
"filetime",
603-
"getopts",
604-
"libc",
605-
"log",
606-
"miow 0.3.3",
607-
"regex",
608-
"rustfix 0.4.6",
609-
"serde",
610-
"serde_derive",
611-
"serde_json",
612-
"tempfile",
613-
"tester",
614-
"winapi 0.3.8",
615-
]
616-
617595
[[package]]
618596
name = "compiletest_rs"
619597
version = "0.5.0"
@@ -627,7 +605,7 @@ dependencies = [
627605
"log",
628606
"miow 0.3.3",
629607
"regex",
630-
"rustfix 0.5.0",
608+
"rustfix",
631609
"serde",
632610
"serde_derive",
633611
"serde_json",
@@ -2190,7 +2168,7 @@ dependencies = [
21902168
"byteorder",
21912169
"cargo_metadata 0.9.1",
21922170
"colored",
2193-
"compiletest_rs 0.4.0",
2171+
"compiletest_rs",
21942172
"directories",
21952173
"env_logger 0.7.1",
21962174
"getrandom",
@@ -4395,18 +4373,6 @@ dependencies = [
43954373
"rustdoc",
43964374
]
43974375

4398-
[[package]]
4399-
name = "rustfix"
4400-
version = "0.4.6"
4401-
source = "registry+https://github.com/rust-lang/crates.io-index"
4402-
checksum = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607"
4403-
dependencies = [
4404-
"failure",
4405-
"log",
4406-
"serde",
4407-
"serde_json",
4408-
]
4409-
44104376
[[package]]
44114377
name = "rustfix"
44124378
version = "0.5.0"

src/tools/miri

Submodule miri updated 112 files

0 commit comments

Comments
 (0)