Merge from rustc · model-checking/verify-rust-std@16450f7 (original) (raw)
`@@ -20,8 +20,12 @@ core = { path = "../core", public = true }
`
20
20
`compiler_builtins = { version = "0.1.105" }
`
21
21
`profiler_builtins = { path = "../profiler_builtins", optional = true }
`
22
22
`unwind = { path = "../unwind" }
`
23
``
`-
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }
`
24
``
`-
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
`
``
23
`+
hashbrown = { version = "0.14", default-features = false, features = [
`
``
24
`+
'rustc-dep-of-std',
`
``
25
`+
] }
`
``
26
`+
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = [
`
``
27
`+
'rustc-dep-of-std',
`
``
28
`+
] }
`
25
29
``
26
30
`` # Dependencies of the backtrace crate
``
27
31
`rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }
`
`@@ -31,13 +35,27 @@ miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
`
31
35
`addr2line = { version = "0.22.0", optional = true, default-features = false }
`
32
36
``
33
37
`[target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
`
34
``
`-
libc = { version = "0.2.153", default-features = false, features = ['rustc-dep-of-std'], public = true }
`
``
38
`+
libc = { version = "0.2.153", default-features = false, features = [
`
``
39
`+
'rustc-dep-of-std',
`
``
40
`+
], public = true }
`
35
41
``
36
42
`[target.'cfg(all(not(target_os = "aix"), not(all(windows, target_env = "msvc", not(target_vendor = "uwp")))))'.dependencies]
`
37
``
`-
object = { version = "0.36.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] }
`
``
43
`+
object = { version = "0.36.0", default-features = false, optional = true, features = [
`
``
44
`+
'read_core',
`
``
45
`+
'elf',
`
``
46
`+
'macho',
`
``
47
`+
'pe',
`
``
48
`+
'unaligned',
`
``
49
`+
'archive',
`
``
50
`+
] }
`
38
51
``
39
52
`[target.'cfg(target_os = "aix")'.dependencies]
`
40
``
`-
object = { version = "0.36.0", default-features = false, optional = true, features = ['read_core', 'xcoff', 'unaligned', 'archive'] }
`
``
53
`+
object = { version = "0.36.0", default-features = false, optional = true, features = [
`
``
54
`+
'read_core',
`
``
55
`+
'xcoff',
`
``
56
`+
'unaligned',
`
``
57
`+
'archive',
`
``
58
`+
] }
`
41
59
``
42
60
`[dev-dependencies]
`
43
61
`rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
`
`@@ -47,23 +65,29 @@ rand_xorshift = "0.3.0"
`
47
65
`dlmalloc = { version = "0.2.4", features = ['rustc-dep-of-std'] }
`
48
66
``
49
67
`[target.x86_64-fortanix-unknown-sgx.dependencies]
`
50
``
`-
fortanix-sgx-abi = { version = "0.5.0", features = ['rustc-dep-of-std'], public = true }
`
``
68
`+
fortanix-sgx-abi = { version = "0.5.0", features = [
`
``
69
`+
'rustc-dep-of-std',
`
``
70
`+
], public = true }
`
51
71
``
52
72
`[target.'cfg(target_os = "hermit")'.dependencies]
`
53
``
`-
hermit-abi = { version = "0.4.0", features = ['rustc-dep-of-std'], public = true }
`
``
73
`+
hermit-abi = { version = "0.4.0", features = [
`
``
74
`+
'rustc-dep-of-std',
`
``
75
`+
], public = true }
`
54
76
``
55
77
`[target.'cfg(target_os = "wasi")'.dependencies]
`
56
``
`-
wasi = { version = "0.11.0", features = ['rustc-dep-of-std'], default-features = false }
`
``
78
`+
wasi = { version = "0.11.0", features = [
`
``
79
`+
'rustc-dep-of-std',
`
``
80
`+
], default-features = false }
`
57
81
``
58
82
`[target.'cfg(target_os = "uefi")'.dependencies]
`
59
``
`-
r-efi = { version = "4.2.0", features = ['rustc-dep-of-std'] }
`
``
83
`+
r-efi = { version = "4.5.0", features = ['rustc-dep-of-std'] }
`
60
84
`r-efi-alloc = { version = "1.0.0", features = ['rustc-dep-of-std'] }
`
61
85
``
62
86
`[features]
`
63
87
`backtrace = [
`
64
``
`-
'addr2line/rustc-dep-of-std',
`
65
``
`-
'object/rustc-dep-of-std',
`
66
``
`-
'miniz_oxide/rustc-dep-of-std',
`
``
88
`+
'addr2line/rustc-dep-of-std',
`
``
89
`+
'object/rustc-dep-of-std',
`
``
90
`+
'miniz_oxide/rustc-dep-of-std',
`
67
91
`]
`
68
92
``
69
93
`panic-unwind = ["panic_unwind"]
`
`@@ -77,7 +101,10 @@ llvm-libunwind = ["unwind/llvm-libunwind"]
`
77
101
`system-llvm-libunwind = ["unwind/system-llvm-libunwind"]
`
78
102
``
79
103
`# Make panics and failed asserts immediately abort without formatting any message
`
80
``
`-
panic_immediate_abort = ["core/panic_immediate_abort", "alloc/panic_immediate_abort"]
`
``
104
`+
panic_immediate_abort = [
`
``
105
`+
"core/panic_immediate_abort",
`
``
106
`+
"alloc/panic_immediate_abort",
`
``
107
`+
]
`
81
108
`# Choose algorithms that are optimized for binary size instead of runtime performance
`
82
109
`optimize_for_size = ["core/optimize_for_size", "alloc/optimize_for_size"]
`
83
110
``
`@@ -97,6 +124,11 @@ threads = 125
`
97
124
`# Maximum heap size
`
98
125
`heap_size = 0x8000000
`
99
126
``
``
127
`+
[[test]]
`
``
128
`+
name = "pipe-subprocess"
`
``
129
`+
path = "tests/pipe_subprocess.rs"
`
``
130
`+
harness = false
`
``
131
+
100
132
`[[bench]]
`
101
133
`name = "stdbenches"
`
102
134
`path = "benches/lib.rs"
`