Skip to content

Commit 31b9b01

Browse files
committed
Auto merge of rust-lang#99530 - RalfJung:miri, r=oli-obk
update Miri Fixes rust-lang#99461 r? `@oli-obk` because of lockfile changes (seems like serde is getting implicitly bumped)
2 parents 62b272d + c2df1c2 commit 31b9b01

File tree

2 files changed

+31
-17
lines changed

2 files changed

+31
-17
lines changed

Cargo.lock

+30-16
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"
319319

320320
[[package]]
321321
name = "camino"
322-
version = "1.0.5"
322+
version = "1.0.9"
323323
source = "registry+https://github.com/rust-lang/crates.io-index"
324-
checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
324+
checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412"
325325
dependencies = [
326326
"serde",
327327
]
@@ -506,6 +506,19 @@ dependencies = [
506506
"serde_json",
507507
]
508508

509+
[[package]]
510+
name = "cargo_metadata"
511+
version = "0.15.0"
512+
source = "registry+https://github.com/rust-lang/crates.io-index"
513+
checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
514+
dependencies = [
515+
"camino",
516+
"cargo-platform 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
517+
"semver",
518+
"serde",
519+
"serde_json",
520+
]
521+
509522
[[package]]
510523
name = "cargotest2"
511524
version = "0.1.0"
@@ -696,7 +709,7 @@ dependencies = [
696709
name = "clippy_lints"
697710
version = "0.1.64"
698711
dependencies = [
699-
"cargo_metadata",
712+
"cargo_metadata 0.14.0",
700713
"clippy_utils",
701714
"if_chain",
702715
"itertools",
@@ -1959,9 +1972,9 @@ dependencies = [
19591972

19601973
[[package]]
19611974
name = "itoa"
1962-
version = "0.4.6"
1975+
version = "1.0.2"
19631976
source = "registry+https://github.com/rust-lang/crates.io-index"
1964-
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
1977+
checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
19651978

19661979
[[package]]
19671980
name = "jemalloc-sys"
@@ -3316,7 +3329,7 @@ dependencies = [
33163329
"anyhow",
33173330
"cargo",
33183331
"cargo-util",
3319-
"cargo_metadata",
3332+
"cargo_metadata 0.14.0",
33203333
"clippy_lints",
33213334
"crossbeam-channel",
33223335
"difference",
@@ -4723,7 +4736,7 @@ dependencies = [
47234736
"annotate-snippets 0.9.1",
47244737
"anyhow",
47254738
"bytecount",
4726-
"cargo_metadata",
4739+
"cargo_metadata 0.14.0",
47274740
"clap",
47284741
"derive-new",
47294742
"diff",
@@ -4821,27 +4834,27 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
48214834

48224835
[[package]]
48234836
name = "semver"
4824-
version = "1.0.3"
4837+
version = "1.0.12"
48254838
source = "registry+https://github.com/rust-lang/crates.io-index"
4826-
checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe"
4839+
checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
48274840
dependencies = [
48284841
"serde",
48294842
]
48304843

48314844
[[package]]
48324845
name = "serde"
4833-
version = "1.0.125"
4846+
version = "1.0.140"
48344847
source = "registry+https://github.com/rust-lang/crates.io-index"
4835-
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
4848+
checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
48364849
dependencies = [
48374850
"serde_derive",
48384851
]
48394852

48404853
[[package]]
48414854
name = "serde_derive"
4842-
version = "1.0.125"
4855+
version = "1.0.140"
48434856
source = "registry+https://github.com/rust-lang/crates.io-index"
4844-
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
4857+
checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
48454858
dependencies = [
48464859
"proc-macro2",
48474860
"quote",
@@ -4859,9 +4872,9 @@ dependencies = [
48594872

48604873
[[package]]
48614874
name = "serde_json"
4862-
version = "1.0.59"
4875+
version = "1.0.82"
48634876
source = "registry+https://github.com/rust-lang/crates.io-index"
4864-
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
4877+
checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
48654878
dependencies = [
48664879
"indexmap",
48674880
"itoa",
@@ -5288,7 +5301,7 @@ dependencies = [
52885301
name = "tidy"
52895302
version = "0.1.0"
52905303
dependencies = [
5291-
"cargo_metadata",
5304+
"cargo_metadata 0.14.0",
52925305
"crossbeam-utils",
52935306
"lazy_static",
52945307
"regex",
@@ -5518,6 +5531,7 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
55185531
name = "ui_test"
55195532
version = "0.1.0"
55205533
dependencies = [
5534+
"cargo_metadata 0.15.0",
55215535
"color-eyre",
55225536
"colored",
55235537
"crossbeam",

src/tools/miri

Submodule miri updated 203 files

0 commit comments

Comments
 (0)