Skip to content

Commit 18ad268

Browse files
committed
Auto merge of rust-lang#79863 - JohnTitor:compiler-builtins, r=bjorn3
Update `compiler_builtins` to 0.1.39 This version contains the fixes of rust-lang/compiler-builtins#390 and rust-lang/compiler-builtins#391. Also, rename features following rust-lang/compiler-builtins#386.
2 parents a5b1c82 + ac7d3b3 commit 18ad268

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

alloc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2018"
88

99
[dependencies]
1010
core = { path = "../core" }
11-
compiler_builtins = { version = "0.1.10", features = ['rustc-dep-of-std'] }
11+
compiler_builtins = { version = "0.1.39", features = ['rustc-dep-of-std'] }
1212

1313
[dev-dependencies]
1414
rand = "0.7"
@@ -31,5 +31,5 @@ harness = false
3131
[features]
3232
compiler-builtins-mem = ['compiler_builtins/mem']
3333
compiler-builtins-c = ["compiler_builtins/c"]
34-
compiler-builtins-asm = ["compiler_builtins/asm"]
34+
compiler-builtins-no-asm = ["compiler_builtins/no-asm"]
3535
compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"]

std/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
1717
panic_abort = { path = "../panic_abort" }
1818
core = { path = "../core" }
1919
libc = { version = "0.2.79", default-features = false, features = ['rustc-dep-of-std'] }
20-
compiler_builtins = { version = "0.1.35" }
20+
compiler_builtins = { version = "0.1.39" }
2121
profiler_builtins = { path = "../profiler_builtins", optional = true }
2222
unwind = { path = "../unwind" }
2323
hashbrown = { version = "0.9.0", default-features = false, features = ['rustc-dep-of-std'] }
@@ -60,7 +60,7 @@ panic-unwind = ["panic_unwind"]
6060
profiler = ["profiler_builtins"]
6161
compiler-builtins-c = ["alloc/compiler-builtins-c"]
6262
compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
63-
compiler-builtins-asm = ["alloc/compiler-builtins-asm"]
63+
compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"]
6464
compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"]
6565
llvm-libunwind = ["unwind/llvm-libunwind"]
6666
system-llvm-libunwind = ["unwind/system-llvm-libunwind"]

test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"]
2626
backtrace = ["std/backtrace"]
2727
compiler-builtins-c = ["std/compiler-builtins-c"]
2828
compiler-builtins-mem = ["std/compiler-builtins-mem"]
29-
compiler-builtins-asm = ["std/compiler-builtins-asm"]
29+
compiler-builtins-no-asm = ["std/compiler-builtins-no-asm"]
3030
compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"]
3131
llvm-libunwind = ["std/llvm-libunwind"]
3232
system-llvm-libunwind = ["std/system-llvm-libunwind"]

0 commit comments

Comments
 (0)