Skip to content

Commit 9f83961

Browse files
borsbors
committed
Auto merge of #60651 - Centril:rollup-zoamjfk, r=Centril
Rollup of 8 pull requests Successful merges: - #59979 (to_xe_bytes for isize and usize returns an array of different size) - #60491 (std: Update compiler-builtins crate) - #60550 (Add tests for concrete const types) - #60572 (Add test for #59972) - #60627 (test for #50518) - #60634 (Document + Cleanup lang_items.rs) - #60641 (Instead of ICEing on incorrect pattern, use delay_span_bug) - #60644 (Use `delay_span_bug` for "Failed to unify obligation") Failed merges: r? @ghost
2 parents 3f5152e + f683b6b commit 9f83961

16 files changed

+370
-92
lines changed

‎Cargo.lock

+17-17
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies = [
1717
name = "alloc"
1818
version = "0.0.0"
1919
dependencies = [
20-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
20+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
2121
"core 0.0.0",
2222
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
2323
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -115,7 +115,7 @@ version = "0.1.27"
115115
source = "registry+https://github.com/rust-lang/crates.io-index"
116116
dependencies = [
117117
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
118-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
118+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
119119
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
120120
"rustc-std-workspace-core 1.0.0",
121121
]
@@ -450,7 +450,7 @@ dependencies = [
450450

451451
[[package]]
452452
name = "compiler_builtins"
453-
version = "0.1.10"
453+
version = "0.1.12"
454454
source = "registry+https://github.com/rust-lang/crates.io-index"
455455
dependencies = [
456456
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -736,7 +736,7 @@ name = "dlmalloc"
736736
version = "0.1.3"
737737
source = "registry+https://github.com/rust-lang/crates.io-index"
738738
dependencies = [
739-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
739+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
740740
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
741741
"rustc-std-workspace-core 1.0.0",
742742
]
@@ -902,7 +902,7 @@ name = "fortanix-sgx-abi"
902902
version = "0.3.2"
903903
source = "registry+https://github.com/rust-lang/crates.io-index"
904904
dependencies = [
905-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
905+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
906906
"rustc-std-workspace-core 1.0.0",
907907
]
908908

@@ -1063,7 +1063,7 @@ name = "hashbrown"
10631063
version = "0.3.0"
10641064
source = "registry+https://github.com/rust-lang/crates.io-index"
10651065
dependencies = [
1066-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
1066+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
10671067
"rustc-std-workspace-alloc 1.0.0",
10681068
"rustc-std-workspace-core 1.0.0",
10691069
]
@@ -1764,7 +1764,7 @@ dependencies = [
17641764
name = "panic_abort"
17651765
version = "0.0.0"
17661766
dependencies = [
1767-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
1767+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
17681768
"core 0.0.0",
17691769
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
17701770
]
@@ -1774,7 +1774,7 @@ name = "panic_unwind"
17741774
version = "0.0.0"
17751775
dependencies = [
17761776
"alloc 0.0.0",
1777-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
1777+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
17781778
"core 0.0.0",
17791779
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
17801780
"unwind 0.0.0",
@@ -1959,7 +1959,7 @@ name = "profiler_builtins"
19591959
version = "0.0.0"
19601960
dependencies = [
19611961
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
1962-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
1962+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
19631963
"core 0.0.0",
19641964
]
19651965

@@ -2484,7 +2484,7 @@ name = "rustc-demangle"
24842484
version = "0.1.10"
24852485
source = "registry+https://github.com/rust-lang/crates.io-index"
24862486
dependencies = [
2487-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
2487+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
24882488
"rustc-std-workspace-core 1.0.0",
24892489
]
24902490

@@ -2612,7 +2612,7 @@ dependencies = [
26122612
"alloc 0.0.0",
26132613
"build_helper 0.1.0",
26142614
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2615-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
2615+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
26162616
"core 0.0.0",
26172617
]
26182618

@@ -2842,7 +2842,7 @@ dependencies = [
28422842
"alloc 0.0.0",
28432843
"build_helper 0.1.0",
28442844
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2845-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
2845+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
28462846
"core 0.0.0",
28472847
]
28482848

@@ -2904,7 +2904,7 @@ dependencies = [
29042904
"alloc 0.0.0",
29052905
"build_helper 0.1.0",
29062906
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2907-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
2907+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
29082908
"core 0.0.0",
29092909
]
29102910

@@ -3021,7 +3021,7 @@ dependencies = [
30213021
"alloc 0.0.0",
30223022
"build_helper 0.1.0",
30233023
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
3024-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
3024+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
30253025
"core 0.0.0",
30263026
]
30273027

@@ -3290,7 +3290,7 @@ dependencies = [
32903290
"alloc 0.0.0",
32913291
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
32923292
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
3293-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
3293+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
32943294
"core 0.0.0",
32953295
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
32963296
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3882,7 +3882,7 @@ name = "unwind"
38823882
version = "0.0.0"
38833883
dependencies = [
38843884
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
3885-
"compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
3885+
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
38863886
"core 0.0.0",
38873887
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
38883888
]
@@ -4078,7 +4078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40784078
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
40794079
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
40804080
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4081-
"checksum compiler_builtins 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4ada53ac629568219809178f988ca2aac9889e9a847379588c097d30ce185145"
4081+
"checksum compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "6549720ae78db799196d4af8f719facb4c7946710b4b64148482553e54b56d15"
40824082
"checksum compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f40ecc9332b68270998995c00f8051ee856121764a0d3230e64c9efd059d27b6"
40834083
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
40844084
"checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"

0 commit comments

Comments
 (0)