Slim `rustc_parse_format` dependencies down by Veykril · Pull Request #138602 · rust-lang/rust

Veykril · 2025-03-17T12:09:32Z

rustc_index is only used for its size assertion macro, so demote it to a dev-dependency gated under testing instead. This allows the crate to built without having to wait for syn (pulled in by rustc_index_macros)

Alternatively we could inline the macro, though from the looks of it that will run into trouble with rustc_randomized_layouts

rustbot · 2025-03-17T12:09:36Z

r? @SparrowLii

rustbot has assigned @SparrowLii.
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

klensy · 2025-03-17T12:27:21Z

If this for optimizing deps for r-a, you can add nightly feature like here and gate that macro?

rust/compiler/rustc_abi/Cargo.toml

Lines 22 to 25 in 9bad8ac

default = ["nightly", "randomize"] 
# rust-analyzer depends on this crate and we therefore require it to built on a stable toolchain
# without depending on rustc_data_structures, rustc_macros and rustc_serialize
nightly = [ 

Oh, this authored by you.

Veykril · 2025-03-17T12:31:50Z

r-a will depend on rustc_index either way, the change here only allows rustc_parse_format to build earlier instead of waiting on rustc_index which waits for rustc_index_macros which waits aeons for syn to build.

SparrowLii · 2025-03-18T00:22:06Z

Thanks! Can you resolve the confilct?

SparrowLii · 2025-03-18T07:32:09Z

@bors r+

bors · 2025-03-18T07:32:12Z

📌 Commit 7fdb7bd has been approved by SparrowLii

It is now in the queue for this repository.

bors · 2025-03-18T07:32:12Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

bors · 2025-03-19T17:04:14Z

☔ The latest upstream changes (presumably #138693) made this pull request unmergeable. Please resolve the merge conflicts.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#135394 (`MaybeUninit` inherent slice methods part 2) - rust-lang#137051 (Implement default methods for `io::Empty` and `io::Sink`) - rust-lang#138001 (mir_build: consider privacy when checking for irrefutable patterns) - rust-lang#138540 (core/slice: Mark some `split_off` variants unstably const) - rust-lang#138589 (If a label is placed on the block of a loop instead of the header, suggest moving it to the header.) - rust-lang#138594 (Fix next solver handling of shallow trait impl check) - rust-lang#138613 (Remove E0773 "A builtin-macro was defined more than once.") Failed merges: - rust-lang#138602 (Slim `rustc_parse_format` dependencies down) r? `@ghost` `@rustbot` modify labels: rollup

jieyouxu · 2025-03-20T03:59:17Z

@bors p=1 (somewhat conflict-prone)

bors · 2025-03-23T06:22:43Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout push-purxoytpktpu(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self push-purxoytpktpu --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_parse_format/src/lib.rs
Auto-merging compiler/rustc_parse_format/Cargo.toml
CONFLICT (content): Merge conflict in compiler/rustc_parse_format/Cargo.toml
Automatic merge failed; fix conflicts and then commit the result.

`rustc_index` is only used for its size assertion macro, so demote it to a dev-dependency gated under testing instead

jieyouxu · 2025-03-23T06:42:53Z

@bors r=SparrowLii p=5 (conflict-prone)

bors · 2025-03-23T06:42:56Z

📌 Commit 5950c86 has been approved by SparrowLii

It is now in the queue for this repository.

jieyouxu · 2025-03-23T06:43:42Z

@bors rollup (can be included in rollup)

…owLii Slim `rustc_parse_format` dependencies down `rustc_index` is only used for its size assertion macro, so demote it to a dev-dependency gated under testing instead. This allows the crate to built without having to wait for `syn` (pulled in by `rustc_index_macros`) Alternatively we could inline the macro, though from the looks of it that will run into trouble with `rustc_randomized_layouts`

Rollup of 9 pull requests Successful merges: - rust-lang#138236 (uefi: Add OwnedEvent abstraction) - rust-lang#138293 (rustdoc: Gate unstable `doc(cfg())` predicates) - rust-lang#138509 (Add test to ensure no index out of bounds panic (rust-lang#135474)) - rust-lang#138602 (Slim `rustc_parse_format` dependencies down) - rust-lang#138631 (Update test for SGX now implementing `read_buf`) - rust-lang#138641 (Add unstable `--print=supported-crate-types` option) - rust-lang#138662 (Implement some basics in UEFI fs) - rust-lang#138837 (resolve: Avoid remaining unstable iteration) - rust-lang#138849 (doc: rename reference #create-a-configtoml to #create-a-bootstraptoml) Failed merges: - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-03-23T10:00:13Z

⌛ Testing commit 5950c86 with merge 97fc1f6...

bors · 2025-03-23T13:04:48Z

☀️ Test successful - checks-actions
Approved by: SparrowLii
Pushing 97fc1f6 to master...

github-actions · 2025-03-23T13:06:59Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 60a3084 (parent) -> 97fc1f6 (this PR)

Test differences

No test diffs found

rust-timer · 2025-03-23T14:21:11Z

Finished benchmarking commit (97fc1f6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 774.048s -> 775.27s (0.16%)
Artifact size: 365.55 MiB -> 365.52 MiB (-0.01%)

rustbot assigned SparrowLii Mar 17, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 17, 2025

Veykril force-pushed the push-purxoytpktpu branch from e9b8cc6 to 7fdb7bdCompare March 18, 2025 06:19

SparrowLii approved these changes Mar 18, 2025
View reviewed changes

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 Mar 18, 2025

Sakib25800 mentioned this pull request Mar 19, 2025
Rollup of 3 pull requests #138680
Closed

matthiaskrgr mentioned this pull request Mar 19, 2025
Rollup of 7 pull requests #138714
Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 19, 2025

Slim rustc_parse_format dependencies down
5950c86
`rustc_index` is only used for its size assertion macro, so demote it to a dev-dependency gated under testing instead

Veykril force-pushed the push-purxoytpktpu branch from 7fdb7bd to 5950c86Compare March 23, 2025 06:30

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 23, 2025

jieyouxu mentioned this pull request Mar 23, 2025
Rollup of 9 pull requests #138853
Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2025

bors merged commit 97fc1f6 into rust-lang:masterMar 23, 2025

rustbot added this to the 1.87.0 milestone Mar 23, 2025

Veykril deleted the push-purxoytpktpu branch March 23, 2025 14:22

Uh oh!

Uh oh!

Conversation

Veykril commented Mar 17, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 17, 2025

Uh oh!

klensy commented Mar 17, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Veykril commented Mar 17, 2025

Uh oh!

SparrowLii commented Mar 18, 2025

Uh oh!

SparrowLii commented Mar 18, 2025

Uh oh!

bors commented Mar 18, 2025

Uh oh!

bors commented Mar 18, 2025

Uh oh!

bors commented Mar 19, 2025

Uh oh!

jieyouxu commented Mar 20, 2025

Uh oh!

bors commented Mar 23, 2025

Uh oh!

jieyouxu commented Mar 23, 2025

Uh oh!

bors commented Mar 23, 2025

Uh oh!

jieyouxu commented Mar 23, 2025

Uh oh!

bors commented Mar 23, 2025

Uh oh!

bors commented Mar 23, 2025

Uh oh!

github-actionsBot commented Mar 23, 2025

Test differences

Uh oh!

rust-timer commented Mar 23, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Veykril commented Mar 17, 2025•
edited
Loading

klensy commented Mar 17, 2025•
edited
Loading