diff options
| author | bors <bors@rust-lang.org> | 2020-07-20 06:09:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-20 06:09:42 +0000 |
| commit | 05630b06fdf76c25c6ccf2e9ac3567592eae6c67 (patch) | |
| tree | 2a604e7e11f34ffdc68487fc6f2f3800818193f7 /src/libstd | |
| parent | 891e6fee572009ff2be4d4057fb33483610c36a7 (diff) | |
| parent | 028f8d7b85898683b99e05564cd2976c7e0d5b43 (diff) | |
| download | rust-05630b06fdf76c25c6ccf2e9ac3567592eae6c67.tar.gz rust-05630b06fdf76c25c6ccf2e9ac3567592eae6c67.zip | |
Auto merge of #74540 - alexcrichton:std-no-backtrace, r=Mark-Simulacrum
std: Fix compilation without backtrace feature This should hopefully handle #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.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 136db6d5d32..42403bdb1bc 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -27,7 +27,7 @@ hashbrown = { version = "0.6.2", default-features = false, features = ['rustc-de # Dependencies of the `backtrace` crate addr2line = { version = "0.13.0", optional = true, default-features = false } -rustc-demangle = { version = "0.1.4", optional = true } +rustc-demangle = { version = "0.1.4", features = ['rustc-dep-of-std'] } miniz_oxide = { version = "0.4.0", optional = true, default-features = false } [dependencies.object] version = "0.20" @@ -55,7 +55,6 @@ backtrace = [ "gimli-symbolize", 'addr2line/rustc-dep-of-std', 'object/rustc-dep-of-std', - 'rustc-demangle/rustc-dep-of-std', 'miniz_oxide/rustc-dep-of-std', ] gimli-symbolize = [] |