Skip to content

fix: no-proc-macro is overridden by subsequent edges#15764

Merged
weihanglo merged 2 commits into
rust-lang:masterfrom
ChenRuiwei:fix-tree-no-proc-macro
Jul 23, 2025
Merged

fix: no-proc-macro is overridden by subsequent edges#15764
weihanglo merged 2 commits into
rust-lang:masterfrom
ChenRuiwei:fix-tree-no-proc-macro

Conversation

@ChenRuiwei
Copy link
Copy Markdown
Contributor

@ChenRuiwei ChenRuiwei commented Jul 22, 2025

What does this PR try to resolve?

To close #15763.

How to test and review this PR?

See steps in #15763.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jul 22, 2025

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-cli Area: Command-line interface, option parsing, etc. Command-tree S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 22, 2025
weihanglo
weihanglo reviewed Jul 22, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution! Would you like to add a test for this fix?

Generally, new tests would be added in a commit before behavior changes, and pass. This shows the current buggy behavior. The next commit would include the actual code fix and the test change. The diff with the fix would show how the behavior changed.

@ChenRuiwei ChenRuiwei force-pushed the fix-tree-no-proc-macro branch from b37eb50 to 49fb343 Compare July 23, 2025 13:50
@ChenRuiwei
Copy link
Copy Markdown
Contributor Author

ChenRuiwei commented Jul 23, 2025

Thanks for the contribution! Would you like to add a test for this fix?

Generally, new tests would be added in a commit before behavior changes, and pass. This shows the current buggy behavior. The next commit would include the actual code fix and the test change. The diff with the fix would show how the behavior changed.

Thanks for your review!

New test has been added.

weihanglo
weihanglo reviewed Jul 23, 2025
View reviewed changes
Comment thread tests/testsuite/cargo_tree/deps.rs
p.cargo("tree -e no-proc-macro,normal")
.with_stdout_data(str![[r#"
foo v0.1.0 ([ROOT]/foo)
└── dep v1.0.0
Copy link
Copy Markdown
Member

@weihanglo weihanglo Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: should be like this in this commit, so it can be served as a minimal reproducible example, and we love to see tests pass in every commit. After this, the next commit will have both the fix, and the test change to demonstrate the behavior change.

Suggested change
└── dep v1.0.0
├── dep v1.0.0
└── pm v1.0.0 (proc-macro)

another nit: the commmit message should be scoped as "test" not "feat"

Copy link
Copy Markdown
Contributor Author

@ChenRuiwei ChenRuiwei Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All fixed by force push.

@ChenRuiwei ChenRuiwei force-pushed the fix-tree-no-proc-macro branch from 49fb343 to 2654f29 Compare July 23, 2025 16:07
@weihanglo
Copy link
Copy Markdown
Member

weihanglo commented Jul 23, 2025

Thanks for the contribution!

@weihanglo weihanglo added this pull request to the merge queue Jul 23, 2025
Merged via the queue into rust-lang:master with commit dfcf4c2 Jul 23, 2025
24 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2025
@weihanglo weihanglo mentioned this pull request Jul 25, 2025
Merged
bors added a commit to rust-lang/rust that referenced this pull request Jul 25, 2025
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
0d8ea0f 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
bors added a commit to rust-lang/rust that referenced this pull request Jul 25, 2025
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
0dd07bd 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
@rustbot rustbot added this to the 1.90.0 milestone Jul 26, 2025
github-actions Bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jul 28, 2025
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
c8b5269 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
github-actions Bot pushed a commit to rust-lang/rust-analyzer that referenced this pull request Jul 28, 2025
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
13e8568 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
rust-cloud-vms Bot pushed a commit to makai410/rustc_public that referenced this pull request Aug 16, 2025
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
463b047 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
rust-cloud-vms Bot pushed a commit to makai410/rustc_public that referenced this pull request Aug 20, 2025
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
03c3880 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 8, 2025
@bors
Auto merge of rust-lang#144338 - weihanglo:update-cargo, r=weihanglo
6f7d4aa 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 10, 2025
@bors
Auto merge of rust-lang#144338 - weihanglo:update-cargo, r=weihanglo
78d3388 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
makai410 pushed a commit to makai410/rustc_public that referenced this pull request Nov 16, 2025
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
5982a0d 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
makai410 pushed a commit to makai410/rustc_public that referenced this pull request Mar 27, 2026
@bors
Auto merge of #144338 - weihanglo:update-cargo, r=weihanglo
591a400 
Update cargo

8 commits in 6833aa715d724437dc1247d0166afe314ab6854e..9b296973b425ffb159e12cf3cd56580fd5c85382
2025-07-13 02:25:52 +0000 to 2025-07-25 17:10:08 +0000
- Allow using Cargo-as-a-library with gix's reqwest backend (rust-lang/cargo#15653)
- Make timings graphs scalable to user's window (rust-lang/cargo#15766)
- refactor: rename arg `mode` to `intent` (rust-lang/cargo#15774)
- fix: `no-proc-macro` is overridden by subsequent edges (rust-lang/cargo#15764)
- Use `gix` for `cargo package` (rust-lang/cargo#15534)
- cargo-credential-libsecret: give FFI correctly-sized object (rust-lang/cargo#15767)
- Remove unnecessary target-c-int-width from target specs (rust-lang/cargo#15759)
- Expose artifact dependency getters in cargo-as-a-library (rust-lang/cargo#15753)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@epage epage

Labels

A-cli Area: Command-line interface, option parsing, etc. Command-tree

Projects

None yet

Milestone

1.90.0

Development

Successfully merging this pull request may close these issues.

cargo tree -e no-proc-macro only takes effect when no-proc-macro is placed at the end

4 participants

@ChenRuiwei @rustbot @weihanglo @epage