Add `--prune` option for cargo-tree #9520

weihanglo · 2021-05-29T03:48:09Z

Part of #8105

Prune the given package from the display of the dependency tree. Also providing a nice suggestion if the package is not within the resolved dependency graph.

rust-highfive · 2021-05-29T03:48:12Z

r? @Eh2406

(rust-highfive has picked a reviewer for you, use r? to override)

ehuss

Looks good, thanks! Just a few small things.

src/bin/cargo/commands/tree.rs

src/cargo/ops/tree/mod.rs

ehuss · 2021-06-02T21:26:07Z

@rfcbot fcp merge

@rust-lang/cargo This adds a new stable flag --prune to the cargo tree command. This can be helpful when trying to view a large dependency tree. An example is rust-lang's workspace where you can add something like --prune rustc-workspace-hack to remove things that aren't important or get in the way.

rfcbot · 2021-06-02T21:26:08Z

Team member @ehuss has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

Co-authored-by: Eric Huss <eric@huss.org>

rfcbot · 2021-06-03T02:55:25Z

🔔 This is now entering its final comment period, as per the review above. 🔔

ehuss · 2021-06-09T00:28:48Z

Thanks!

@bors r+

bors · 2021-06-09T00:28:50Z

📌 Commit c685c13 has been approved by ehuss

bors · 2021-06-09T00:28:57Z

⌛ Testing commit c685c13 with merge aa8b092...

bors · 2021-06-09T00:56:20Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing aa8b092 to master...

Update cargo 11 commits in 0cecbd67323ca14a7eb6505900d0d7307b00355b..aa8b09297bb3156b849e73db48af4cd050492fe6 2021-06-01 20:09:13 +0000 to 2021-06-09 00:28:53 +0000 - Add `--prune` option for cargo-tree (rust-lang/cargo#9520) - Fix typo in gitignore docs. (rust-lang/cargo#9556) - Fix typos in command_prelude.rs (rust-lang/cargo#9552) - Make clippy happy (rust-lang/cargo#9551) - Remove some dead code. (rust-lang/cargo#9546) - Add additional test for CJK progress width (rust-lang/cargo#9515) - Pull in semver 1.0.3 'x' fix (rust-lang/cargo#9544) - Add some tracking issues to unstable docs. (rust-lang/cargo#9540) - Update documentation for include/exclude. (rust-lang/cargo#9538) - Bump mdbook version for contrib guide. (rust-lang/cargo#9534) - Replace deprecated `[replace]` references with `[patch]` (rust-lang/cargo#9533)

Pkgsrc changes: * Bump bootstrap requirements to 1.53.0. * Adjust patches, adapt to upstream changes, adjust cargo checksums * If using an external llvm, require >= 10.0 Upsteream changes: Version 1.54.0 (2021-07-29) ============================ Language ----------------------- - [You can now use macros for values in built-in attribute macros.][83366] While a seemingly minor addition on its own, this enables a lot of powerful functionality when combined correctly. Most notably you can now include external documentation in your crate by writing the following. ```rust #![doc = include_str!("README.md")] ``` You can also use this to include auto-generated modules: ```rust #[path = concat!(env!("OUT_DIR"), "/generated.rs")] mod generated; ``` - [You can now cast between unsized slice types (and types which contain unsized slices) in `const fn`.][85078] - [You can now use multiple generic lifetimes with `impl Trait` where the lifetimes don't explicitly outlive another.][84701] In code this means that you can now have `impl Trait<'a, 'b>` where as before you could only have `impl Trait<'a, 'b> where 'b: 'a`. Compiler ----------------------- - [Rustc will now search for custom JSON targets in `/lib/rustlib/<target-triple>/target.json` where `/` is the "sysroot" directory.][83800] You can find your sysroot directory by running `rustc --print sysroot`. - [Added `wasm` as a `target_family` for WebAssembly platforms.][84072] - [You can now use `#[target_feature]` on safe functions when targeting WebAssembly platforms.][84988] - [Improved debugger output for enums on Windows MSVC platforms.][85292] - [Added tier 3\* support for `bpfel-unknown-none` and `bpfeb-unknown-none`.][79608] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries ----------------------- - [`panic::panic_any` will now `#[track_caller]`.][85745] - [Added `OutOfMemory` as a variant of `io::ErrorKind`.][84744] - [ `proc_macro::Literal` now implements `FromStr`.][84717] - [The implementations of vendor intrinsics in core::arch have been significantly refactored.][83278] The main user-visible changes are a 50% reduction in the size of libcore.rlib and stricter validation of constant operands passed to intrinsics. The latter is technically a breaking change, but allows Rust to more closely match the C vendor intrinsics API. Stabilized APIs --------------- - [`BTreeMap::into_keys`] - [`BTreeMap::into_values`] - [`HashMap::into_keys`] - [`HashMap::into_values`] - [`arch::wasm32`] - [`VecDeque::binary_search`] - [`VecDeque::binary_search_by`] - [`VecDeque::binary_search_by_key`] - [`VecDeque::partition_point`] Cargo ----- - [Added the `--prune <spec>` option to `cargo-tree` to remove a package from the dependency graph.][cargo/9520] - [Added the `--depth` option to `cargo-tree` to print only to a certain depth in the tree ][cargo/9499] - [Added the `no-proc-macro` value to `cargo-tree --edges` to hide procedural macro dependencies.][cargo/9488] - [A new environment variable named `CARGO_TARGET_TMPDIR` is available.][cargo/9375] This variable points to a directory that integration tests and benches can use as a "scratchpad" for testing filesystem operations. Compatibility Notes ------------------- - [Mixing Option and Result via `?` is no longer permitted in closures for inferred types.][86831] - [Previously unsound code is no longer permitted where different constructors in branches could require different lifetimes.][85574] - As previously mentioned the [`std::arch` instrinsics now uses stricter const checking][83278] than before and may reject some previously accepted code. - [`i128` multiplication on Cortex M0+ platforms currently unconditionally causes overflow when compiled with `codegen-units = 1`.][86063] [85574]: rust-lang/rust#85574 [86831]: rust-lang/rust#86831 [86063]: rust-lang/rust#86063 [86831]: rust-lang/rust#86831 [79608]: rust-lang/rust#79608 [84988]: rust-lang/rust#84988 [84701]: rust-lang/rust#84701 [84072]: rust-lang/rust#84072 [85745]: rust-lang/rust#85745 [84744]: rust-lang/rust#84744 [85078]: rust-lang/rust#85078 [84717]: rust-lang/rust#84717 [83800]: rust-lang/rust#83800 [83366]: rust-lang/rust#83366 [83278]: rust-lang/rust#83278 [85292]: rust-lang/rust#85292 [cargo/9520]: rust-lang/cargo#9520 [cargo/9499]: rust-lang/cargo#9499 [cargo/9488]: rust-lang/cargo#9488 [cargo/9375]: rust-lang/cargo#9375 [`BTreeMap::into_keys`]: https://doc.rust-lang.org/std/collections/struct.BTreeMap.html#method.into_keys [`BTreeMap::into_values`]: https://doc.rust-lang.org/std/collections/struct.BTreeMap.html#method.into_values [`HashMap::into_keys`]: https://doc.rust-lang.org/std/collections/struct.HashMap.html#method.into_keys [`HashMap::into_values`]: https://doc.rust-lang.org/std/collections/struct.HashMap.html#method.into_values [`arch::wasm32`]: https://doc.rust-lang.org/core/arch/wasm32/index.html [`VecDeque::binary_search`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.binary_search [`VecDeque::binary_search_by`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.binary_search_by [`VecDeque::binary_search_by_key`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.binary_search_by_key [`VecDeque::partition_point`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.partition_point

weihanglo added 4 commits May 29, 2021 11:25

refactor(cargo-tree): skip level earlier when exceeded

8a747ab

feat(carog-tree): new --prune option

b5998ae

test(carog-tree): new --prune option

64f5d10

doc(carog-tree): new --prune option

07c40a7

rust-highfive assigned Eh2406 May 29, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2021

ehuss added the T-cargo Team: Cargo label Jun 2, 2021

ehuss reviewed Jun 2, 2021

View reviewed changes

src/bin/cargo/commands/tree.rs Outdated Show resolved Hide resolved

src/cargo/ops/tree/mod.rs Outdated Show resolved Hide resolved

rfcbot added proposed-final-comment-period An FCP proposal has started, but not yet signed off. disposition-merge FCP with intent to merge labels Jun 2, 2021

weihanglo and others added 2 commits June 3, 2021 06:52

refactor(cargo-tree): remove premature micro optimization

681c194

Co-authored-by: Eric Huss <eric@huss.org>

refactor(cargo-tree): simplify arg-parsing logic

c685c13

Co-authored-by: Eric Huss <eric@huss.org>

rfcbot added the final-comment-period FCP — a period for last comments before action is taken label Jun 3, 2021

rfcbot removed the proposed-final-comment-period An FCP proposal has started, but not yet signed off. label Jun 3, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 9, 2021

bors merged commit aa8b092 into rust-lang:master Jun 9, 2021

ehuss mentioned this pull request Jun 9, 2021

Update cargo rust-lang/rust#86159

Merged

rfcbot added finished-final-comment-period FCP complete to-announce and removed final-comment-period FCP — a period for last comments before action is taken labels Jun 13, 2021

weihanglo deleted the tree-prune branch June 28, 2021 06:57

ehuss added this to the 1.54.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `--prune` option for cargo-tree #9520

Add `--prune` option for cargo-tree #9520

weihanglo commented May 29, 2021

rust-highfive commented May 29, 2021

ehuss left a comment

ehuss commented Jun 2, 2021

rfcbot commented Jun 2, 2021 •

edited by joshtriplett

Loading

rfcbot commented Jun 3, 2021

ehuss commented Jun 9, 2021

bors commented Jun 9, 2021

bors commented Jun 9, 2021

bors commented Jun 9, 2021

Add --prune option for cargo-tree #9520

Add --prune option for cargo-tree #9520

Conversation

weihanglo commented May 29, 2021

rust-highfive commented May 29, 2021

ehuss left a comment

Choose a reason for hiding this comment

ehuss commented Jun 2, 2021

rfcbot commented Jun 2, 2021 • edited by joshtriplett Loading

rfcbot commented Jun 3, 2021

ehuss commented Jun 9, 2021

bors commented Jun 9, 2021

bors commented Jun 9, 2021

bors commented Jun 9, 2021

Add `--prune` option for cargo-tree #9520

Add `--prune` option for cargo-tree #9520

rfcbot commented Jun 2, 2021 •

edited by joshtriplett

Loading