Skip to content

Commit

Permalink
Auto merge of #99530 - RalfJung:miri, r=oli-obk
Browse files Browse the repository at this point in the history
update Miri

Fixes #99461
r? `@oli-obk` because of lockfile changes (seems like serde is getting implicitly bumped)
  • Loading branch information
bors committed Jul 21, 2022
2 parents 62b272d + c2df1c2 commit 31b9b01
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 17 deletions.
46 changes: 30 additions & 16 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,9 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"

[[package]]
name = "camino"
version = "1.0.5"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412"
dependencies = [
"serde",
]
Expand Down Expand Up @@ -506,6 +506,19 @@ dependencies = [
"serde_json",
]

[[package]]
name = "cargo_metadata"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
dependencies = [
"camino",
"cargo-platform 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"semver",
"serde",
"serde_json",
]

[[package]]
name = "cargotest2"
version = "0.1.0"
Expand Down Expand Up @@ -696,7 +709,7 @@ dependencies = [
name = "clippy_lints"
version = "0.1.64"
dependencies = [
"cargo_metadata",
"cargo_metadata 0.14.0",
"clippy_utils",
"if_chain",
"itertools",
Expand Down Expand Up @@ -1959,9 +1972,9 @@ dependencies = [

[[package]]
name = "itoa"
version = "0.4.6"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"

[[package]]
name = "jemalloc-sys"
Expand Down Expand Up @@ -3316,7 +3329,7 @@ dependencies = [
"anyhow",
"cargo",
"cargo-util",
"cargo_metadata",
"cargo_metadata 0.14.0",
"clippy_lints",
"crossbeam-channel",
"difference",
Expand Down Expand Up @@ -4723,7 +4736,7 @@ dependencies = [
"annotate-snippets 0.9.1",
"anyhow",
"bytecount",
"cargo_metadata",
"cargo_metadata 0.14.0",
"clap",
"derive-new",
"diff",
Expand Down Expand Up @@ -4821,27 +4834,27 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"

[[package]]
name = "semver"
version = "1.0.3"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe"
checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
dependencies = [
"serde",
]

[[package]]
name = "serde"
version = "1.0.125"
version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
dependencies = [
"serde_derive",
]

[[package]]
name = "serde_derive"
version = "1.0.125"
version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -4859,9 +4872,9 @@ dependencies = [

[[package]]
name = "serde_json"
version = "1.0.59"
version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
dependencies = [
"indexmap",
"itoa",
Expand Down Expand Up @@ -5288,7 +5301,7 @@ dependencies = [
name = "tidy"
version = "0.1.0"
dependencies = [
"cargo_metadata",
"cargo_metadata 0.14.0",
"crossbeam-utils",
"lazy_static",
"regex",
Expand Down Expand Up @@ -5518,6 +5531,7 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
name = "ui_test"
version = "0.1.0"
dependencies = [
"cargo_metadata 0.15.0",
"color-eyre",
"colored",
"crossbeam",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 203 files

0 comments on commit 31b9b01

Please sign in to comment.