Skip to content

Commit 7bc51b5

Browse files
ruzstd: Make optional for now
1 parent 426d02d commit 7bc51b5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ windows-targets = "0.52.6"
4343

4444
[target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
4545
miniz_oxide = { version = "0.8", default-features = false }
46-
ruzstd = { version = "0.7.2", default-features = false }
46+
ruzstd = { version = "0.7.2", default-features = false, optional = true }
4747
addr2line = { version = "0.24.0", default-features = false }
4848
libc = { version = "0.2.156", default-features = false }
4949

src/symbolize/gimli/elf.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ use super::{gimli, Context, Endian, EndianSlice, Mapping, Stash, Vec};
99
use alloc::sync::Arc;
1010
use core::convert::{TryFrom, TryInto};
1111
use core::str;
12-
use object::elf::{
13-
ELFCOMPRESS_ZLIB, ELFCOMPRESS_ZSTD, ELF_NOTE_GNU, NT_GNU_BUILD_ID, SHF_COMPRESSED,
14-
};
12+
#[cfg(any(feature = "dep:ruzstd", backtrace_ruzstd))]
13+
use object::elf::ELFCOMPRESS_ZSTD;
14+
use object::elf::{ELFCOMPRESS_ZLIB, ELF_NOTE_GNU, NT_GNU_BUILD_ID, SHF_COMPRESSED};
1515
use object::read::elf::{CompressionHeader, FileHeader, SectionHeader, SectionTable, Sym};
1616
use object::read::StringTable;
1717
use object::{BigEndian, Bytes, NativeEndian};
@@ -231,6 +231,7 @@ impl<'a> Object<'a> {
231231
decompress_zlib(data.0, buf)?;
232232
return Some(buf);
233233
}
234+
#[cfg(any(feature = "dep:ruzstd", backtrace_ruzstd))]
234235
ELFCOMPRESS_ZSTD => {
235236
let size = usize::try_from(header.ch_size(self.endian)).ok()?;
236237
let buf = stash.allocate(size);
@@ -357,6 +358,7 @@ fn decompress_zlib(input: &[u8], output: &mut [u8]) -> Option<()> {
357358
}
358359
}
359360

361+
#[cfg(feature = "dep:ruzstd")]
360362
fn decompress_zstd(mut input: &[u8], mut output: &mut [u8]) -> Option<()> {
361363
use ruzstd::frame::ReadFrameHeaderError;
362364
use ruzstd::frame_decoder::FrameDecoderError;

0 commit comments

Comments
 (0)