Skip to content

Commit 823a75d

Browse files
borsbors
committed
Auto merge of #60841 - alexcrichton:update-compiler-builtins, r=RalfJung
Update the compiler_builtins crate This updates to 0.1.13 for `compiler_builtins`, published to fix a few issues. The feature changes here are updated because `compiler_builtins` no longer enables the `c` feature by default but we want to do so through our build still. Closes #60747 Closes #60782
2 parents b982867 + 3c9790e commit 823a75d

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

‎Cargo.lock

+17-17
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies = [
2525
name = "alloc"
2626
version = "0.0.0"
2727
dependencies = [
28-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
28+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
2929
"core 0.0.0",
3030
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
3131
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -123,7 +123,7 @@ version = "0.1.27"
123123
source = "registry+https://github.com/rust-lang/crates.io-index"
124124
dependencies = [
125125
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
126-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
126+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
127127
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
128128
"rustc-std-workspace-core 1.0.0",
129129
]
@@ -462,7 +462,7 @@ dependencies = [
462462

463463
[[package]]
464464
name = "compiler_builtins"
465-
version = "0.1.12"
465+
version = "0.1.14"
466466
source = "registry+https://github.com/rust-lang/crates.io-index"
467467
dependencies = [
468468
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -744,7 +744,7 @@ name = "dlmalloc"
744744
version = "0.1.3"
745745
source = "registry+https://github.com/rust-lang/crates.io-index"
746746
dependencies = [
747-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
747+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
748748
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
749749
"rustc-std-workspace-core 1.0.0",
750750
]
@@ -910,7 +910,7 @@ name = "fortanix-sgx-abi"
910910
version = "0.3.2"
911911
source = "registry+https://github.com/rust-lang/crates.io-index"
912912
dependencies = [
913-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
913+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
914914
"rustc-std-workspace-core 1.0.0",
915915
]
916916

@@ -1071,7 +1071,7 @@ name = "hashbrown"
10711071
version = "0.3.0"
10721072
source = "registry+https://github.com/rust-lang/crates.io-index"
10731073
dependencies = [
1074-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
1074+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
10751075
"rustc-std-workspace-alloc 1.0.0",
10761076
"rustc-std-workspace-core 1.0.0",
10771077
]
@@ -1772,7 +1772,7 @@ dependencies = [
17721772
name = "panic_abort"
17731773
version = "0.0.0"
17741774
dependencies = [
1775-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
1775+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
17761776
"core 0.0.0",
17771777
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
17781778
]
@@ -1782,7 +1782,7 @@ name = "panic_unwind"
17821782
version = "0.0.0"
17831783
dependencies = [
17841784
"alloc 0.0.0",
1785-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
1785+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
17861786
"core 0.0.0",
17871787
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
17881788
"unwind 0.0.0",
@@ -1967,7 +1967,7 @@ name = "profiler_builtins"
19671967
version = "0.0.0"
19681968
dependencies = [
19691969
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
1970-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
1970+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
19711971
"core 0.0.0",
19721972
]
19731973

@@ -2492,7 +2492,7 @@ name = "rustc-demangle"
24922492
version = "0.1.10"
24932493
source = "registry+https://github.com/rust-lang/crates.io-index"
24942494
dependencies = [
2495-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
2495+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
24962496
"rustc-std-workspace-core 1.0.0",
24972497
]
24982498

@@ -2620,7 +2620,7 @@ dependencies = [
26202620
"alloc 0.0.0",
26212621
"build_helper 0.1.0",
26222622
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2623-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
2623+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
26242624
"core 0.0.0",
26252625
]
26262626

@@ -2850,7 +2850,7 @@ dependencies = [
28502850
"alloc 0.0.0",
28512851
"build_helper 0.1.0",
28522852
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2853-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
2853+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
28542854
"core 0.0.0",
28552855
]
28562856

@@ -2912,7 +2912,7 @@ dependencies = [
29122912
"alloc 0.0.0",
29132913
"build_helper 0.1.0",
29142914
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2915-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
2915+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
29162916
"core 0.0.0",
29172917
]
29182918

@@ -3029,7 +3029,7 @@ dependencies = [
30293029
"alloc 0.0.0",
30303030
"build_helper 0.1.0",
30313031
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
3032-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
3032+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
30333033
"core 0.0.0",
30343034
]
30353035

@@ -3298,7 +3298,7 @@ dependencies = [
32983298
"alloc 0.0.0",
32993299
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
33003300
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
3301-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
3301+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
33023302
"core 0.0.0",
33033303
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
33043304
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3889,7 +3889,7 @@ name = "unwind"
38893889
version = "0.0.0"
38903890
dependencies = [
38913891
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
3892-
"compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
3892+
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
38933893
"core 0.0.0",
38943894
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
38953895
]
@@ -4087,7 +4087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40874087
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
40884088
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
40894089
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4090-
"checksum compiler_builtins 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "6549720ae78db799196d4af8f719facb4c7946710b4b64148482553e54b56d15"
4090+
"checksum compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "e3f235c329e5cb9fa3d2ca2cc36256ba9a7f23fa76e0f4db6f68c23b73b2ac69"
40914091
"checksum compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f40ecc9332b68270998995c00f8051ee856121764a0d3230e64c9efd059d27b6"
40924092
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
40934093
"checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"

‎src/bootstrap/compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ pub fn std_cargo(builder: &Builder<'_>,
168168
.arg("--manifest-path")
169169
.arg(builder.src.join("src/liballoc/Cargo.toml"))
170170
.arg("--features")
171-
.arg("compiler-builtins-mem");
171+
.arg("compiler-builtins-mem compiler-builtins-c");
172172
} else {
173173
let features = builder.std_features();
174174

‎src/liballoc/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ harness = false
3333

3434
[features]
3535
compiler-builtins-mem = ['compiler_builtins/mem']
36+
compiler-builtins-c = ["compiler_builtins/c"]

‎src/libstd/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ panic_unwind = { path = "../libpanic_unwind", optional = true }
1919
panic_abort = { path = "../libpanic_abort" }
2020
core = { path = "../libcore" }
2121
libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of-std'] }
22-
compiler_builtins = { version = "0.1.12" }
22+
compiler_builtins = { version = "0.1.14" }
2323
profiler_builtins = { path = "../libprofiler_builtins", optional = true }
2424
unwind = { path = "../libunwind" }
2525
hashbrown = { version = "0.3.0", features = ['rustc-dep-of-std'] }
@@ -54,7 +54,7 @@ default = ["compiler_builtins_c", "std_detect_file_io", "std_detect_dlsym_getaux
5454
backtrace = ["backtrace-sys"]
5555
panic-unwind = ["panic_unwind"]
5656
profiler = ["profiler_builtins"]
57-
compiler_builtins_c = ["compiler_builtins/c"]
57+
compiler_builtins_c = ["alloc/compiler-builtins-c"]
5858
llvm-libunwind = ["unwind/llvm-libunwind"]
5959

6060
# Make panics and failed asserts immediately abort without formatting any message

0 commit comments

Comments
 (0)