Auto merge of #125016 - nicholasbishop:bishop-cb-112, r=tgross35 · model-checking/verify-rust-std@f2bcbec (original) (raw)

3 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -10,7 +10,10 @@ edition = "2021"
10 10
11 11 [dependencies]
12 12 core = { path = "../core" }
13 -compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] }
13 +compiler_builtins = { version = "0.1.114", features = ['rustc-dep-of-std'] }
14 +
15 +[target.'cfg(not(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64")))'.dependencies]
16 +compiler_builtins = { version = "0.1.114", features = ["no-f16-f128"] }
14 17
15 18 [dev-dependencies]
16 19 rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
@@ -38,8 +41,8 @@ harness = false
38 41 compiler-builtins-mem = ['compiler_builtins/mem']
39 42 compiler-builtins-c = ["compiler_builtins/c"]
40 43 compiler-builtins-no-asm = ["compiler_builtins/no-asm"]
44 +compiler-builtins-no-f16-f128 = ["compiler_builtins/no-f16-f128"]
41 45 compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"]
42 -compiler-builtins-weak-intrinsics = ["compiler_builtins/weak-intrinsics"]
43 46 # Make panics and failed asserts immediately abort without formatting any message
44 47 panic_immediate_abort = ["core/panic_immediate_abort"]
45 48 # Choose algorithms that are optimized for binary size instead of runtime performance
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
17 17 panic_unwind = { path = "../panic_unwind", optional = true }
18 18 panic_abort = { path = "../panic_abort" }
19 19 core = { path = "../core", public = true }
20 -compiler_builtins = { version = "0.1.105" }
20 +compiler_builtins = { version = "0.1.114" }
21 21 profiler_builtins = { path = "../profiler_builtins", optional = true }
22 22 unwind = { path = "../unwind" }
23 23 hashbrown = { version = "0.14", default-features = false, features = [
@@ -95,8 +95,8 @@ profiler = ["profiler_builtins"]
95 95 compiler-builtins-c = ["alloc/compiler-builtins-c"]
96 96 compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
97 97 compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"]
98 +compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"]
98 99 compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"]
99 -compiler-builtins-weak-intrinsics = ["alloc/compiler-builtins-weak-intrinsics"]
100 100 llvm-libunwind = ["unwind/llvm-libunwind"]
101 101 system-llvm-libunwind = ["unwind/system-llvm-libunwind"]
102 102
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ backtrace = ["std/backtrace"]
16 16 compiler-builtins-c = ["std/compiler-builtins-c"]
17 17 compiler-builtins-mem = ["std/compiler-builtins-mem"]
18 18 compiler-builtins-no-asm = ["std/compiler-builtins-no-asm"]
19 +compiler-builtins-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"]
19 20 compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"]
20 -compiler-builtins-weak-intrinsics = ["std/compiler-builtins-weak-intrinsics"]
21 21 llvm-libunwind = ["std/llvm-libunwind"]
22 22 system-llvm-libunwind = ["std/system-llvm-libunwind"]
23 23 panic-unwind = ["std/panic_unwind"]