Skip to content

Commit c2ecd3a

Browse files
committed
Auto merge of rust-lang#99283 - RalfJung:miri, r=RalfJung
update Miri Fixes rust-lang#99224 r? `@ghost`
2 parents 967a9c9 + 9b49a79 commit c2ecd3a

File tree

3 files changed

+105
-5
lines changed

3 files changed

+105
-5
lines changed

Cargo.lock

+103-4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ dependencies = [
1414
"rustc-std-workspace-core",
1515
]
1616

17+
[[package]]
18+
name = "addr2line"
19+
version = "0.17.0"
20+
source = "registry+https://github.com/rust-lang/crates.io-index"
21+
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
22+
dependencies = [
23+
"gimli 0.26.1",
24+
]
25+
1726
[[package]]
1827
name = "adler"
1928
version = "0.2.3"
@@ -24,6 +33,12 @@ dependencies = [
2433
"rustc-std-workspace-core",
2534
]
2635

36+
[[package]]
37+
name = "adler"
38+
version = "1.0.2"
39+
source = "registry+https://github.com/rust-lang/crates.io-index"
40+
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
41+
2742
[[package]]
2843
name = "ahash"
2944
version = "0.7.4"
@@ -170,6 +185,21 @@ version = "1.1.0"
170185
source = "registry+https://github.com/rust-lang/crates.io-index"
171186
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
172187

188+
[[package]]
189+
name = "backtrace"
190+
version = "0.3.66"
191+
source = "registry+https://github.com/rust-lang/crates.io-index"
192+
checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
193+
dependencies = [
194+
"addr2line 0.17.0",
195+
"cc",
196+
"cfg-if 1.0.0",
197+
"libc",
198+
"miniz_oxide 0.5.3",
199+
"object 0.29.0",
200+
"rustc-demangle",
201+
]
202+
173203
[[package]]
174204
name = "bitflags"
175205
version = "1.2.1"
@@ -693,6 +723,33 @@ dependencies = [
693723
"rustc-semver",
694724
]
695725

726+
[[package]]
727+
name = "color-eyre"
728+
version = "0.6.2"
729+
source = "registry+https://github.com/rust-lang/crates.io-index"
730+
checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
731+
dependencies = [
732+
"backtrace",
733+
"color-spantrace",
734+
"eyre",
735+
"indenter",
736+
"once_cell",
737+
"owo-colors",
738+
"tracing-error",
739+
]
740+
741+
[[package]]
742+
name = "color-spantrace"
743+
version = "0.2.0"
744+
source = "registry+https://github.com/rust-lang/crates.io-index"
745+
checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
746+
dependencies = [
747+
"once_cell",
748+
"owo-colors",
749+
"tracing-core",
750+
"tracing-error",
751+
]
752+
696753
[[package]]
697754
name = "colored"
698755
version = "2.0.0"
@@ -1239,6 +1296,16 @@ dependencies = [
12391296
"once_cell",
12401297
]
12411298

1299+
[[package]]
1300+
name = "eyre"
1301+
version = "0.6.8"
1302+
source = "registry+https://github.com/rust-lang/crates.io-index"
1303+
checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
1304+
dependencies = [
1305+
"indenter",
1306+
"once_cell",
1307+
]
1308+
12421309
[[package]]
12431310
name = "fake-simd"
12441311
version = "0.1.2"
@@ -1279,7 +1346,7 @@ dependencies = [
12791346
"crc32fast",
12801347
"libc",
12811348
"libz-sys",
1282-
"miniz_oxide",
1349+
"miniz_oxide 0.4.0",
12831350
]
12841351

12851352
[[package]]
@@ -1820,6 +1887,12 @@ dependencies = [
18201887
"version_check",
18211888
]
18221889

1890+
[[package]]
1891+
name = "indenter"
1892+
version = "0.3.3"
1893+
source = "registry+https://github.com/rust-lang/crates.io-index"
1894+
checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
1895+
18231896
[[package]]
18241897
name = "indexmap"
18251898
version = "1.8.2"
@@ -2374,12 +2447,21 @@ version = "0.4.0"
23742447
source = "registry+https://github.com/rust-lang/crates.io-index"
23752448
checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
23762449
dependencies = [
2377-
"adler",
2450+
"adler 0.2.3",
23782451
"compiler_builtins",
23792452
"rustc-std-workspace-alloc",
23802453
"rustc-std-workspace-core",
23812454
]
23822455

2456+
[[package]]
2457+
name = "miniz_oxide"
2458+
version = "0.5.3"
2459+
source = "registry+https://github.com/rust-lang/crates.io-index"
2460+
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
2461+
dependencies = [
2462+
"adler 1.0.2",
2463+
]
2464+
23832465
[[package]]
23842466
name = "mio"
23852467
version = "0.7.14"
@@ -2625,6 +2707,12 @@ dependencies = [
26252707
"winapi",
26262708
]
26272709

2710+
[[package]]
2711+
name = "owo-colors"
2712+
version = "3.4.0"
2713+
source = "registry+https://github.com/rust-lang/crates.io-index"
2714+
checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b"
2715+
26282716
[[package]]
26292717
name = "packed_simd_2"
26302718
version = "0.3.4"
@@ -4971,7 +5059,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
49715059
name = "std"
49725060
version = "0.0.0"
49735061
dependencies = [
4974-
"addr2line",
5062+
"addr2line 0.16.0",
49755063
"alloc",
49765064
"cfg-if 0.1.10",
49775065
"compiler_builtins",
@@ -4981,7 +5069,7 @@ dependencies = [
49815069
"hashbrown 0.12.0",
49825070
"hermit-abi 0.2.0",
49835071
"libc",
4984-
"miniz_oxide",
5072+
"miniz_oxide 0.4.0",
49855073
"object 0.26.2",
49865074
"panic_abort",
49875075
"panic_unwind",
@@ -5372,6 +5460,16 @@ dependencies = [
53725460
"lazy_static",
53735461
]
53745462

5463+
[[package]]
5464+
name = "tracing-error"
5465+
version = "0.2.0"
5466+
source = "registry+https://github.com/rust-lang/crates.io-index"
5467+
checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
5468+
dependencies = [
5469+
"tracing",
5470+
"tracing-subscriber",
5471+
]
5472+
53755473
[[package]]
53765474
name = "tracing-log"
53775475
version = "0.1.2"
@@ -5450,6 +5548,7 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
54505548
name = "ui_test"
54515549
version = "0.1.0"
54525550
dependencies = [
5551+
"color-eyre",
54535552
"colored",
54545553
"crossbeam",
54555554
"lazy_static",

src/tools/miri

Submodule miri updated 464 files

src/tools/tidy/src/deps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const LICENSES: &[&str] = &[
2020
"Unlicense OR MIT",
2121
"0BSD OR MIT OR Apache-2.0", // adler license
2222
"Zlib OR Apache-2.0 OR MIT", // tinyvec
23+
"MIT OR Zlib OR Apache-2.0", // miniz_oxide
2324
];
2425

2526
/// These are exceptions to Rust's permissive licensing policy, and

0 commit comments

Comments
 (0)