Skip to content

Commit 05630b0

Browse files
committed
Auto merge of rust-lang#74540 - alexcrichton:std-no-backtrace, r=Mark-Simulacrum
std: Fix compilation without backtrace feature This should hopefully handle rust-lang#74484 but in any case fixes compilation of the standard library without the `backtrace` feature. The need for this feature is somewhat unclear now because the `backtrace` crate should always compile (no more C code!) but we can handle that later if necessary.
2 parents 891e6fe + 028f8d7 commit 05630b0

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/libstd/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ hashbrown = { version = "0.6.2", default-features = false, features = ['rustc-de
2727

2828
# Dependencies of the `backtrace` crate
2929
addr2line = { version = "0.13.0", optional = true, default-features = false }
30-
rustc-demangle = { version = "0.1.4", optional = true }
30+
rustc-demangle = { version = "0.1.4", features = ['rustc-dep-of-std'] }
3131
miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
3232
[dependencies.object]
3333
version = "0.20"
@@ -55,7 +55,6 @@ backtrace = [
5555
"gimli-symbolize",
5656
'addr2line/rustc-dep-of-std',
5757
'object/rustc-dep-of-std',
58-
'rustc-demangle/rustc-dep-of-std',
5958
'miniz_oxide/rustc-dep-of-std',
6059
]
6160
gimli-symbolize = []

0 commit comments

Comments
 (0)