diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-06 20:59:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-06 20:59:35 +0100 |
| commit | 8e2631bdb647d0a8377649be4c97784a95d72034 (patch) | |
| tree | 6525a6be55c769ed61ff8a2c32a52c3bebcacc97 | |
| parent | c31a4b9ac46a752d26b0fc9a56942eef16fe631c (diff) | |
| parent | 85e0d42a776cc0fc655b39cb9e085d36caec071b (diff) | |
| download | rust-8e2631bdb647d0a8377649be4c97784a95d72034.tar.gz rust-8e2631bdb647d0a8377649be4c97784a95d72034.zip | |
Rollup merge of #135146 - Zalathar:anyhow-backtrace, r=jieyouxu
Don't enable anyhow's `backtrace` feature in opt-dist As of the stabilization of `std::backtrace` in Rust 1.65, this package flag has no effect other than to enable an unused dependency on the `backtrace` crate. (See <https://github.com/dtolnay/anyhow/blob/af0937ef72fbaf9784a6c991e029738728d025e2/Cargo.toml#L18-L23>.) While the presence of this feature in opt-dist doesn't cause other tools (which use anyhow) to actually *build* backtrace, it does affect the global crate graph used for dependency version resolution. After removing this feature, we can use `cargo tree --invert --package backtrace` to see that the only remaining reverse-dependency of backtrace is `color-eyre`, which is used by `ui_test`.
| -rw-r--r-- | Cargo.lock | 3 | ||||
| -rw-r--r-- | src/tools/opt-dist/Cargo.toml | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index fca4469803b..51166a06d2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,9 +185,6 @@ name = "anyhow" version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" -dependencies = [ - "backtrace", -] [[package]] name = "ar_archive_writer" diff --git a/src/tools/opt-dist/Cargo.toml b/src/tools/opt-dist/Cargo.toml index d0413911014..cea234cc74c 100644 --- a/src/tools/opt-dist/Cargo.toml +++ b/src/tools/opt-dist/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" build_helper = { path = "../../build_helper" } env_logger = "0.11" log = "0.4" -anyhow = { version = "1", features = ["backtrace"] } +anyhow = "1" humantime = "2" humansize = "2" sysinfo = { version = "0.31.2", default-features = false, features = ["disk"] } |