Skip to content

Commit 9356627

Browse files
committed
Auto merge of #2662 - RalfJung:rustup, r=RalfJung
Rustup
2 parents 71c3ecf + c02fa89 commit 9356627

File tree

575 files changed

+8439
-4439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

575 files changed

+8439
-4439
lines changed

Cargo.lock

Lines changed: 67 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,26 @@ version = 3
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.16.0"
7+
version = "0.17.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
9+
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
1010
dependencies = [
1111
"compiler_builtins",
12-
"gimli 0.25.0",
12+
"gimli",
1313
"rustc-std-workspace-alloc",
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-
2617
[[package]]
2718
name = "adler"
28-
version = "0.2.3"
19+
version = "1.0.2"
2920
source = "registry+https://github.com/rust-lang/crates.io-index"
30-
checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
21+
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
3122
dependencies = [
3223
"compiler_builtins",
3324
"rustc-std-workspace-core",
3425
]
3526

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-
4227
[[package]]
4328
name = "ahash"
4429
version = "0.7.4"
@@ -185,12 +170,12 @@ version = "0.3.66"
185170
source = "registry+https://github.com/rust-lang/crates.io-index"
186171
checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
187172
dependencies = [
188-
"addr2line 0.17.0",
173+
"addr2line",
189174
"cc",
190175
"cfg-if 1.0.0",
191176
"libc",
192-
"miniz_oxide 0.5.3",
193-
"object 0.29.0",
177+
"miniz_oxide",
178+
"object",
194179
"rustc-demangle",
195180
]
196181

@@ -1295,15 +1280,15 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
12951280

12961281
[[package]]
12971282
name = "flate2"
1298-
version = "1.0.16"
1283+
version = "1.0.23"
12991284
source = "registry+https://github.com/rust-lang/crates.io-index"
1300-
checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
1285+
checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
13011286
dependencies = [
1302-
"cfg-if 0.1.10",
1287+
"cfg-if 1.0.0",
13031288
"crc32fast",
13041289
"libc",
13051290
"libz-sys",
1306-
"miniz_oxide 0.4.0",
1291+
"miniz_oxide",
13071292
]
13081293

13091294
[[package]]
@@ -1545,25 +1530,17 @@ dependencies = [
15451530
"wasi 0.9.0+wasi-snapshot-preview1",
15461531
]
15471532

1548-
[[package]]
1549-
name = "gimli"
1550-
version = "0.25.0"
1551-
source = "registry+https://github.com/rust-lang/crates.io-index"
1552-
checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
1553-
dependencies = [
1554-
"compiler_builtins",
1555-
"rustc-std-workspace-alloc",
1556-
"rustc-std-workspace-core",
1557-
]
1558-
15591533
[[package]]
15601534
name = "gimli"
15611535
version = "0.26.1"
15621536
source = "registry+https://github.com/rust-lang/crates.io-index"
15631537
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
15641538
dependencies = [
1539+
"compiler_builtins",
15651540
"fallible-iterator",
15661541
"indexmap",
1542+
"rustc-std-workspace-alloc",
1543+
"rustc-std-workspace-core",
15671544
"stable_deref_trait",
15681545
]
15691546

@@ -2228,25 +2205,16 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
22282205

22292206
[[package]]
22302207
name = "miniz_oxide"
2231-
version = "0.4.0"
2208+
version = "0.5.3"
22322209
source = "registry+https://github.com/rust-lang/crates.io-index"
2233-
checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
2210+
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
22342211
dependencies = [
2235-
"adler 0.2.3",
2212+
"adler",
22362213
"compiler_builtins",
22372214
"rustc-std-workspace-alloc",
22382215
"rustc-std-workspace-core",
22392216
]
22402217

2241-
[[package]]
2242-
name = "miniz_oxide"
2243-
version = "0.5.3"
2244-
source = "registry+https://github.com/rust-lang/crates.io-index"
2245-
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
2246-
dependencies = [
2247-
"adler 1.0.2",
2248-
]
2249-
22502218
[[package]]
22512219
name = "miow"
22522220
version = "0.3.7"
@@ -2346,29 +2314,20 @@ dependencies = [
23462314
"libc",
23472315
]
23482316

2349-
[[package]]
2350-
name = "object"
2351-
version = "0.26.2"
2352-
source = "registry+https://github.com/rust-lang/crates.io-index"
2353-
checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"
2354-
dependencies = [
2355-
"compiler_builtins",
2356-
"memchr",
2357-
"rustc-std-workspace-alloc",
2358-
"rustc-std-workspace-core",
2359-
]
2360-
23612317
[[package]]
23622318
name = "object"
23632319
version = "0.29.0"
23642320
source = "registry+https://github.com/rust-lang/crates.io-index"
23652321
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
23662322
dependencies = [
2323+
"compiler_builtins",
23672324
"crc32fast",
23682325
"flate2",
23692326
"hashbrown",
23702327
"indexmap",
23712328
"memchr",
2329+
"rustc-std-workspace-alloc",
2330+
"rustc-std-workspace-core",
23722331
]
23732332

23742333
[[package]]
@@ -2522,7 +2481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
25222481
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
25232482
dependencies = [
25242483
"lock_api",
2525-
"parking_lot_core 0.9.3",
2484+
"parking_lot_core 0.9.4",
25262485
]
25272486

25282487
[[package]]
@@ -2541,15 +2500,15 @@ dependencies = [
25412500

25422501
[[package]]
25432502
name = "parking_lot_core"
2544-
version = "0.9.3"
2503+
version = "0.9.4"
25452504
source = "registry+https://github.com/rust-lang/crates.io-index"
2546-
checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
2505+
checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
25472506
dependencies = [
25482507
"cfg-if 1.0.0",
25492508
"libc",
25502509
"redox_syscall",
25512510
"smallvec",
2552-
"windows-sys 0.36.1",
2511+
"windows-sys 0.42.0",
25532512
]
25542513

25552514
[[package]]
@@ -2774,9 +2733,9 @@ dependencies = [
27742733

27752734
[[package]]
27762735
name = "psm"
2777-
version = "0.1.16"
2736+
version = "0.1.21"
27782737
source = "registry+https://github.com/rust-lang/crates.io-index"
2779-
checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"
2738+
checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
27802739
dependencies = [
27812740
"cc",
27822741
]
@@ -3305,7 +3264,7 @@ dependencies = [
33053264
"cstr",
33063265
"libc",
33073266
"measureme",
3308-
"object 0.29.0",
3267+
"object",
33093268
"rustc-demangle",
33103269
"rustc_ast",
33113270
"rustc_attr",
@@ -3339,7 +3298,7 @@ dependencies = [
33393298
"itertools",
33403299
"jobserver",
33413300
"libc",
3342-
"object 0.29.0",
3301+
"object",
33433302
"pathdiff",
33443303
"regex",
33453304
"rustc_arena",
@@ -4677,9 +4636,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
46774636

46784637
[[package]]
46794638
name = "stacker"
4680-
version = "0.1.14"
4639+
version = "0.1.15"
46814640
source = "registry+https://github.com/rust-lang/crates.io-index"
4682-
checksum = "90939d5171a4420b3ff5fbc8954d641e7377335454c259dcb80786f3f21dc9b4"
4641+
checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
46834642
dependencies = [
46844643
"cc",
46854644
"cfg-if 1.0.0",
@@ -4698,7 +4657,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
46984657
name = "std"
46994658
version = "0.0.0"
47004659
dependencies = [
4701-
"addr2line 0.16.0",
4660+
"addr2line",
47024661
"alloc",
47034662
"cfg-if 1.0.0",
47044663
"compiler_builtins",
@@ -4708,8 +4667,8 @@ dependencies = [
47084667
"hashbrown",
47094668
"hermit-abi 0.2.6",
47104669
"libc",
4711-
"miniz_oxide 0.4.0",
4712-
"object 0.26.2",
4670+
"miniz_oxide",
4671+
"object",
47134672
"panic_abort",
47144673
"panic_unwind",
47154674
"profiler_builtins",
@@ -4926,9 +4885,9 @@ version = "0.3.0"
49264885
source = "registry+https://github.com/rust-lang/crates.io-index"
49274886
checksum = "e6cb0c7868d7f90407531108ab03263d9452a8811b7cdd87675343a40d4aa254"
49284887
dependencies = [
4929-
"gimli 0.26.1",
4888+
"gimli",
49304889
"hashbrown",
4931-
"object 0.29.0",
4890+
"object",
49324891
"tracing",
49334892
]
49344893

@@ -5499,17 +5458,25 @@ dependencies = [
54995458

55005459
[[package]]
55015460
name = "windows-sys"
5502-
version = "0.36.1"
5461+
version = "0.42.0"
55035462
source = "registry+https://github.com/rust-lang/crates.io-index"
5504-
checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
5463+
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
55055464
dependencies = [
5506-
"windows_aarch64_msvc 0.36.1",
5507-
"windows_i686_gnu 0.36.1",
5508-
"windows_i686_msvc 0.36.1",
5509-
"windows_x86_64_gnu 0.36.1",
5510-
"windows_x86_64_msvc 0.36.1",
5465+
"windows_aarch64_gnullvm",
5466+
"windows_aarch64_msvc 0.42.0",
5467+
"windows_i686_gnu 0.42.0",
5468+
"windows_i686_msvc 0.42.0",
5469+
"windows_x86_64_gnu 0.42.0",
5470+
"windows_x86_64_gnullvm",
5471+
"windows_x86_64_msvc 0.42.0",
55115472
]
55125473

5474+
[[package]]
5475+
name = "windows_aarch64_gnullvm"
5476+
version = "0.42.0"
5477+
source = "registry+https://github.com/rust-lang/crates.io-index"
5478+
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
5479+
55135480
[[package]]
55145481
name = "windows_aarch64_msvc"
55155482
version = "0.28.0"
@@ -5518,9 +5485,9 @@ checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2"
55185485

55195486
[[package]]
55205487
name = "windows_aarch64_msvc"
5521-
version = "0.36.1"
5488+
version = "0.42.0"
55225489
source = "registry+https://github.com/rust-lang/crates.io-index"
5523-
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
5490+
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
55245491

55255492
[[package]]
55265493
name = "windows_i686_gnu"
@@ -5530,9 +5497,9 @@ checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a"
55305497

55315498
[[package]]
55325499
name = "windows_i686_gnu"
5533-
version = "0.36.1"
5500+
version = "0.42.0"
55345501
source = "registry+https://github.com/rust-lang/crates.io-index"
5535-
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
5502+
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
55365503

55375504
[[package]]
55385505
name = "windows_i686_msvc"
@@ -5542,9 +5509,9 @@ checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64"
55425509

55435510
[[package]]
55445511
name = "windows_i686_msvc"
5545-
version = "0.36.1"
5512+
version = "0.42.0"
55465513
source = "registry+https://github.com/rust-lang/crates.io-index"
5547-
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
5514+
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
55485515

55495516
[[package]]
55505517
name = "windows_x86_64_gnu"
@@ -5554,9 +5521,15 @@ checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954"
55545521

55555522
[[package]]
55565523
name = "windows_x86_64_gnu"
5557-
version = "0.36.1"
5524+
version = "0.42.0"
5525+
source = "registry+https://github.com/rust-lang/crates.io-index"
5526+
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
5527+
5528+
[[package]]
5529+
name = "windows_x86_64_gnullvm"
5530+
version = "0.42.0"
55585531
source = "registry+https://github.com/rust-lang/crates.io-index"
5559-
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
5532+
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
55605533

55615534
[[package]]
55625535
name = "windows_x86_64_msvc"
@@ -5566,9 +5539,9 @@ checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f"
55665539

55675540
[[package]]
55685541
name = "windows_x86_64_msvc"
5569-
version = "0.36.1"
5542+
version = "0.42.0"
55705543
source = "registry+https://github.com/rust-lang/crates.io-index"
5571-
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
5544+
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
55725545

55735546
[[package]]
55745547
name = "xattr"

0 commit comments

Comments
 (0)