Auto merge of #113432 - klensy:ms-cut-backtrace, r=ChrisDenton
reduce deps for windows-msvc targets for backtrace (eventually) mirrors https://github.com/rust-lang/backtrace-rs/pull/543 Some dependencies of backtrace don't used on windows-msvc targets, so exclude them: miniz_oxide (+ adler) addr2line (+ gimli) object (+ memchr) This saves about 30kb of std.dll + 17.5mb of rlibs
This commit is contained in:
commit
08691f0c92
4 changed files with 13 additions and 9 deletions
|
@ -25,14 +25,12 @@ hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep
|
|||
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
|
||||
|
||||
# Dependencies of the `backtrace` crate
|
||||
addr2line = { version = "0.20.0", optional = true, default-features = false }
|
||||
rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
|
||||
miniz_oxide = { version = "0.7.0", optional = true, default-features = false, public = false }
|
||||
[dependencies.object]
|
||||
version = "0.31.1"
|
||||
optional = true
|
||||
default-features = false
|
||||
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
|
||||
|
||||
[target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
|
||||
miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
|
||||
addr2line = { version = "0.20.0", optional = true, default-features = false }
|
||||
object = { version = "0.31.1", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] }
|
||||
|
||||
[dev-dependencies]
|
||||
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
|
||||
|
|
|
@ -397,9 +397,15 @@ extern crate libc;
|
|||
#[allow(unused_extern_crates)]
|
||||
extern crate unwind;
|
||||
|
||||
// FIXME: #94122 this extern crate definition only exist here to stop
|
||||
// miniz_oxide docs leaking into std docs. Find better way to do it.
|
||||
// Remove exclusion from tidy platform check when this removed.
|
||||
#[doc(masked)]
|
||||
#[allow(unused_extern_crates)]
|
||||
#[cfg(feature = "miniz_oxide")]
|
||||
#[cfg(all(
|
||||
not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))),
|
||||
feature = "miniz_oxide"
|
||||
))]
|
||||
extern crate miniz_oxide;
|
||||
|
||||
// During testing, this crate is not actually the "real" std library, but rather
|
||||
|
|
|
@ -113,7 +113,6 @@ const PERMITTED_DEPS_LOCATION: &str = concat!(file!(), ":", line!());
|
|||
/// rustc. Please check with the compiler team before adding an entry.
|
||||
const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
|
||||
// tidy-alphabetical-start
|
||||
"addr2line",
|
||||
"adler",
|
||||
"ahash",
|
||||
"aho-corasick",
|
||||
|
|
|
@ -52,6 +52,7 @@ const EXCEPTION_PATHS: &[&str] = &[
|
|||
// FIXME: platform-specific code should be moved to `sys`
|
||||
"library/std/src/io/copy.rs",
|
||||
"library/std/src/io/stdio.rs",
|
||||
"library/std/src/lib.rs", // for miniz_oxide leaking docs, which itself workaround
|
||||
"library/std/src/path.rs",
|
||||
"library/std/src/sys_common", // Should only contain abstractions over platforms
|
||||
"library/std/src/net/test.rs", // Utility helpers for tests
|
||||
|
|
Loading…
Add table
Reference in a new issue