`cargo tree -e no-proc-macro` to hide procedural macro dependencies #9488

weihanglo · 2021-05-15T18:19:46Z

Probably resolves #9165

cargo tree -e no-proc-macro now hides procedural macro dependencies.

Note that when passed with --invert <spec>, the spec's reverse proc-macro dependencies are also hidden. Is this desired result?

Also, since I want -p <spec> and -i <spec> works with any valid package-id in the project, the filter logic is written in print stage instead of graph build stage

rust-highfive · 2021-05-15T18:19:48Z

r? @ehuss

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

ehuss

Thanks, looks good!

I don't really have an opinion on the --invert behavior. This is probably fine, and can be tweaked later if someone really cares about it.

src/bin/cargo/commands/tree.rs

ehuss · 2021-05-27T22:16:57Z

@rfcbot fcp merge

@rust-lang/cargo This is a small addition to add cargo tree -e no-proc-macro to filter out proc-macros from the cargo tree output. This can be helpful if you are interested in which dependencies are actually included in the target binary, and proc-macros can clog the output with lots of dependencies.

rfcbot · 2021-05-27T22:16:58Z

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.

rfcbot · 2021-05-27T23:20:20Z

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

Co-authored-by: Eric Huss <[email protected]>

alexcrichton · 2021-05-28T14:55:15Z

@bors: r=ehuss

bors · 2021-05-28T14:55:17Z

📌 Commit c2fd499 has been approved by ehuss

bors · 2021-05-28T14:55:30Z

⌛ Testing commit c2fd499 with merge 238a9fa...

bors · 2021-05-28T15:19:02Z

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

Update cargo 10 commits in e931e4796b61de593aa1097649445e535c9c7ee0..0cecbd67323ca14a7eb6505900d0d7307b00355b 2021-05-24 16:17:27 +0000 to 2021-06-01 20:09:13 +0000 - Configure hosts separately from targets when --target is specified. (rust-lang/cargo#9322) - Add some validation to rustc-link-arg (rust-lang/cargo#9523) - Implement suggestions for unknown features in workspace (rust-lang/cargo#9420) - Extract common `make_dep_path` to cargo_util (rust-lang/cargo#9529) - Add a note about rustflags compatibility. (rust-lang/cargo#9524) - Consolidate doc collision detection. (rust-lang/cargo#9526) - Add `--depth` option for `cargo-tree` (rust-lang/cargo#9499) - `cargo tree -e no-proc-macro` to hide procedural macro dependencies (rust-lang/cargo#9488) - Update to semver 1.0.0 (rust-lang/cargo#9508) - Update tar dependency to 0.4.35 (rust-lang/cargo#9517)

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 6 commits May 16, 2021 01:59

feat: add no-proc-macro for --edges option

b5a1197

test: assert no-proc-macro for existing tests

c8af637

test: cargo tree incorrect --edges arg

a5139b9

doc: add no-proc-macro description for --edges

ecd730e

doc: generated via build-man.sh

0ad53bf

refactor: move arg manipulations into commands

dc5f530

rust-highfive assigned ehuss May 15, 2021

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

ehuss reviewed May 27, 2021

View reviewed changes

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

ehuss added the T-cargo Team: Cargo label May 27, 2021

rfcbot added proposed-final-comment-period An FCP proposal has started, but not yet signed off. disposition-merge FCP with intent to merge final-comment-period FCP — a period for last comments before action is taken labels May 27, 2021

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

fix: remove unnecessary match bindings

c2fd499

Co-authored-by: Eric Huss <[email protected]>

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 May 28, 2021

bors merged commit 238a9fa into rust-lang:master May 28, 2021

weihanglo deleted the issue-9165 branch May 28, 2021 15:19

bors mentioned this pull request May 28, 2021

Add --depth option for cargo-tree #9499

Merged

ehuss mentioned this pull request Jun 2, 2021

Update cargo rust-lang/rust#85926

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 6, 2021

ehuss added this to the 1.54.0 milestone Feb 6, 2022

weihanglo mentioned this pull request Apr 26, 2023

cargo tree -i does not interpret -e no-proc-macro in a useful way #12030

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`cargo tree -e no-proc-macro` to hide procedural macro dependencies #9488

`cargo tree -e no-proc-macro` to hide procedural macro dependencies #9488

weihanglo commented May 15, 2021 •

edited

Loading

rust-highfive commented May 15, 2021

ehuss left a comment

ehuss commented May 27, 2021

rfcbot commented May 27, 2021 •

edited by alexcrichton

Loading

rfcbot commented May 27, 2021

alexcrichton commented May 28, 2021

bors commented May 28, 2021

bors commented May 28, 2021

bors commented May 28, 2021

cargo tree -e no-proc-macro to hide procedural macro dependencies #9488

cargo tree -e no-proc-macro to hide procedural macro dependencies #9488

Conversation

weihanglo commented May 15, 2021 • edited Loading

rust-highfive commented May 15, 2021

ehuss left a comment

Choose a reason for hiding this comment

ehuss commented May 27, 2021

rfcbot commented May 27, 2021 • edited by alexcrichton Loading

rfcbot commented May 27, 2021

alexcrichton commented May 28, 2021

bors commented May 28, 2021

bors commented May 28, 2021

bors commented May 28, 2021

`cargo tree -e no-proc-macro` to hide procedural macro dependencies #9488

`cargo tree -e no-proc-macro` to hide procedural macro dependencies #9488

weihanglo commented May 15, 2021 •

edited

Loading

rfcbot commented May 27, 2021 •

edited by alexcrichton

Loading