Various refactors to the proc_macro bridge by bjorn3 · Pull Request #151505 · rust-lang/rust

bjorn3 · 2026-01-22T19:22:42Z

This reduces the amount of types, traits and other abstractions that are involved with the bridge, which should make it easier to understand and modify. This should also help a bit with getting rid of the type marking hack, which is complicating the code a fair bit.

Fixes: #139810

rustbot · 2026-01-22T19:22:46Z

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

rustbot · 2026-01-22T19:22:48Z

r? @petrochenkov

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

Veykril

(rust-analyzer changes)

View changes since this review

compiler/rustc_expand/src/proc_macro_server.rs

library/proc_macro/src/lib.rs

bjorn3 · 2026-01-23T11:19:41Z

@rustbot ready

petrochenkov · 2026-01-23T11:31:40Z

@bors r+

rust-bors · 2026-01-23T11:31:43Z

📌 Commit e47138f has been approved by petrochenkov

It is now in the queue for this repository.

…rochenkov Various refactors to the proc_macro bridge This reduces the amount of types, traits and other abstractions that are involved with the bridge, which should make it easier to understand and modify. This should also help a bit with getting rid of the type marking hack, which is complicating the code a fair bit.

@ghost

…uwer Rollup of 3 pull requests Successful merges: - #150556 (Add Tier 3 Thumb-mode targets for Armv7-A, Armv7-R and Armv8-R) - #151065 (abi: add a rust-preserve-none calling convention) - #151505 (Various refactors to the proc_macro bridge) r? @ghost

…rochenkov Various refactors to the proc_macro bridge This reduces the amount of types, traits and other abstractions that are involved with the bridge, which should make it easier to understand and modify. This should also help a bit with getting rid of the type marking hack, which is complicating the code a fair bit.

@ghost

…uwer Rollup of 7 pull requests Successful merges: - #149848 (Use allocator_shim_contents in allocator_shim_symbols) - #150556 (Add Tier 3 Thumb-mode targets for Armv7-A, Armv7-R and Armv8-R) - #151259 (Fix is_ascii performance regression on AVX-512 CPUs when compiling with -C target-cpu=native) - #151482 (Add "Skip to main content" link for keyboard navigation in rustdoc) - #151505 (Various refactors to the proc_macro bridge) - #151517 (Enable reproducible binary builds with debuginfo on Linux) - #151540 (Tweak bounds check in `DepNodeColorMap.get`) r? @ghost

…rochenkov Various refactors to the proc_macro bridge This reduces the amount of types, traits and other abstractions that are involved with the bridge, which should make it easier to understand and modify. This should also help a bit with getting rid of the type marking hack, which is complicating the code a fair bit.

bjorn3 · 2026-01-24T17:55:22Z

@bors r=petrochenkov,Kobzol

rust-bors · 2026-01-24T17:55:25Z

📌 Commit e8c48c6 has been approved by petrochenkov,Kobzol

It is now in the queue for this repository.

…rochenkov,Kobzol Various refactors to the proc_macro bridge This reduces the amount of types, traits and other abstractions that are involved with the bridge, which should make it easier to understand and modify. This should also help a bit with getting rid of the type marking hack, which is complicating the code a fair bit. Fixes: rust-lang#139810

Rollup of 8 pull requests Successful merges: - #145393 (Add codegen test for removing trailing zeroes from `NonZero`) - #149869 (std: avoid tearing `dbg!` prints) - #150065 (add CSE optimization tests for iterating over slice) - #150842 (Fix(lib/win/thread): Ensure `Sleep`'s usage passes over the requested duration under Win7) - #151244 (Refine dummy_span.rs test) - #151505 (Various refactors to the proc_macro bridge) - #151560 (relnotes: fix 1.93's `as_mut_array` methods) - #151577 (Rename `DepKindStruct` to `DepKindVTable`)

…rochenkov,Kobzol Various refactors to the proc_macro bridge This reduces the amount of types, traits and other abstractions that are involved with the bridge, which should make it easier to understand and modify. This should also help a bit with getting rid of the type marking hack, which is complicating the code a fair bit. Fixes: rust-lang#139810

…uwer Rollup of 11 pull requests Successful merges: - #145393 (Add codegen test for removing trailing zeroes from `NonZero`) - #148764 (ptr_aligment_type: add more APIs) - #149869 (std: avoid tearing `dbg!` prints) - #150065 (add CSE optimization tests for iterating over slice) - #150842 (Fix(lib/win/thread): Ensure `Sleep`'s usage passes over the requested duration under Win7) - #151505 (Various refactors to the proc_macro bridge) - #151560 (relnotes: fix 1.93's `as_mut_array` methods) - #151611 (Improve is_ascii performance on x86_64 with explicit SSE2 intrinsics) - #151317 (x86 soft-float feature: mark it as forbidden rather than unstable) - #151577 (Rename `DepKindStruct` to `DepKindVTable`) - #151620 (Fix 'the the' typo in library/core/src/array/iter.rs)

Rollup of 10 pull requests Successful merges: - #145393 (Add codegen test for removing trailing zeroes from `NonZero`) - #148764 (ptr_aligment_type: add more APIs) - #149869 (std: avoid tearing `dbg!` prints) - #150065 (add CSE optimization tests for iterating over slice) - #150842 (Fix(lib/win/thread): Ensure `Sleep`'s usage passes over the requested duration under Win7) - #151505 (Various refactors to the proc_macro bridge) - #151560 (relnotes: fix 1.93's `as_mut_array` methods) - #151317 (x86 soft-float feature: mark it as forbidden rather than unstable) - #151577 (Rename `DepKindStruct` to `DepKindVTable`) - #151620 (Fix 'the the' typo in library/core/src/array/iter.rs)

Rollup merge of #151505 - bjorn3:proc_macro_refactors, r=petrochenkov,Kobzol Various refactors to the proc_macro bridge This reduces the amount of types, traits and other abstractions that are involved with the bridge, which should make it easier to understand and modify. This should also help a bit with getting rid of the type marking hack, which is complicating the code a fair bit. Fixes: #139810

Rollup of 10 pull requests Successful merges: - rust-lang/rust#145393 (Add codegen test for removing trailing zeroes from `NonZero`) - rust-lang/rust#148764 (ptr_aligment_type: add more APIs) - rust-lang/rust#149869 (std: avoid tearing `dbg!` prints) - rust-lang/rust#150065 (add CSE optimization tests for iterating over slice) - rust-lang/rust#150842 (Fix(lib/win/thread): Ensure `Sleep`'s usage passes over the requested duration under Win7) - rust-lang/rust#151505 (Various refactors to the proc_macro bridge) - rust-lang/rust#151560 (relnotes: fix 1.93's `as_mut_array` methods) - rust-lang/rust#151317 (x86 soft-float feature: mark it as forbidden rather than unstable) - rust-lang/rust#151577 (Rename `DepKindStruct` to `DepKindVTable`) - rust-lang/rust#151620 (Fix 'the the' typo in library/core/src/array/iter.rs)

…enkov more `proc_macro` bridge cleanups Some followups made possible by rust-lang#151505.

Rollup of 10 pull requests Successful merges: - rust-lang/rust#145393 (Add codegen test for removing trailing zeroes from `NonZero`) - rust-lang/rust#148764 (ptr_aligment_type: add more APIs) - rust-lang/rust#149869 (std: avoid tearing `dbg!` prints) - rust-lang/rust#150065 (add CSE optimization tests for iterating over slice) - rust-lang/rust#150842 (Fix(lib/win/thread): Ensure `Sleep`'s usage passes over the requested duration under Win7) - rust-lang/rust#151505 (Various refactors to the proc_macro bridge) - rust-lang/rust#151560 (relnotes: fix 1.93's `as_mut_array` methods) - rust-lang/rust#151317 (x86 soft-float feature: mark it as forbidden rather than unstable) - rust-lang/rust#151577 (Rename `DepKindStruct` to `DepKindVTable`) - rust-lang/rust#151620 (Fix 'the the' typo in library/core/src/array/iter.rs)

…enkov more `proc_macro` bridge cleanups Some followups made possible by rust-lang#151505.

Rollup merge of #151694 - cyrgani:more-pm-cleanup, r=petrochenkov more `proc_macro` bridge cleanups Some followups made possible by #151505.

nnethercote · 2026-01-28T03:01:56Z

Great PR! I've bashed my head against this code in the past, nice to see some of the rough corners removed.

more `proc_macro` bridge cleanups Some followups made possible by rust-lang/rust#151505.

rustbot assigned petrochenkov Jan 22, 2026

This comment has been minimized.

Sign in to view

Veykril approved these changes Jan 23, 2026

View reviewed changes

petrochenkov reviewed Jan 23, 2026

View reviewed changes

compiler/rustc_expand/src/proc_macro_server.rs Outdated Show resolved Hide resolved

library/proc_macro/src/lib.rs Outdated Show resolved Hide resolved

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 23, 2026

This comment was marked as resolved.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 23, 2026

rust-bors bot 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 Jan 23, 2026

JonathanBrouwer mentioned this pull request Jan 23, 2026

Rollup of 3 pull requests #151535

Closed

JonathanBrouwer mentioned this pull request Jan 23, 2026

Rollup of 4 pull requests #151542

Closed

JonathanBrouwer mentioned this pull request Jan 23, 2026

Rollup of 7 pull requests #151547

Closed

matthiaskrgr mentioned this pull request Jan 23, 2026

Rollup of 6 pull requests #151552

Closed

rust-bors bot 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 Jan 24, 2026

matthiaskrgr mentioned this pull request Jan 24, 2026

Rollup of 8 pull requests #151609

Closed

matthiaskrgr mentioned this pull request Jan 24, 2026

Rollup of 9 pull requests #151614

Closed

matthiaskrgr mentioned this pull request Jan 24, 2026

Rollup of 8 pull requests #151617

Closed

JonathanBrouwer mentioned this pull request Jan 25, 2026

Rollup of 11 pull requests #151627

Closed

matthiaskrgr mentioned this pull request Jan 25, 2026

Rollup of 10 pull requests #151634

Merged

rust-bors bot merged commit 996992e into rust-lang:main Jan 25, 2026
12 checks passed

rustbot added this to the 1.95.0 milestone Jan 25, 2026

bjorn3 deleted the proc_macro_refactors branch January 25, 2026 17:43

cyrgani mentioned this pull request Jan 26, 2026

more proc_macro bridge cleanups #151694

Merged

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jan 27, 2026

Rollup merge of rust-lang#151694 - cyrgani:more-pm-cleanup, r=petroch…

1258d82

…enkov more `proc_macro` bridge cleanups Some followups made possible by rust-lang#151505.

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jan 27, 2026

Rollup merge of rust-lang#151694 - cyrgani:more-pm-cleanup, r=petroch…

1fbd27d

…enkov more `proc_macro` bridge cleanups Some followups made possible by rust-lang#151505.

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jan 27, 2026

Rollup merge of rust-lang#151694 - cyrgani:more-pm-cleanup, r=petroch…

84bb764

…enkov more `proc_macro` bridge cleanups Some followups made possible by rust-lang#151505.

rust-timer added a commit that referenced this pull request Jan 27, 2026

Unrolled build for #151694

ce5409c

Rollup merge of #151694 - cyrgani:more-pm-cleanup, r=petrochenkov more `proc_macro` bridge cleanups Some followups made possible by #151505.

github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jan 28, 2026

Rollup merge of #151694 - cyrgani:more-pm-cleanup, r=petrochenkov

d45a473

more `proc_macro` bridge cleanups Some followups made possible by rust-lang/rust#151505.

github-actions bot pushed a commit to rust-lang/rust-analyzer that referenced this pull request Jan 29, 2026

Rollup merge of #151694 - cyrgani:more-pm-cleanup, r=petrochenkov

f0e32d8

more `proc_macro` bridge cleanups Some followups made possible by rust-lang/rust#151505.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Various refactors to the proc_macro bridge#151505

Various refactors to the proc_macro bridge#151505
rust-bors[bot] merged 10 commits intorust-lang:mainfrom
bjorn3:proc_macro_refactors

bjorn3 commented Jan 22, 2026 •

edited by rustbot

Loading

Uh oh!

rustbot commented Jan 22, 2026

Uh oh!

rustbot commented Jan 22, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Veykril left a comment •

edited by rustbot

Loading

Uh oh!

Uh oh!

Uh oh!

bjorn3 commented Jan 23, 2026 •

edited

Loading

Uh oh!

This comment was marked as resolved.

petrochenkov commented Jan 23, 2026

Uh oh!

rust-bors bot commented Jan 23, 2026

Uh oh!

bjorn3 commented Jan 24, 2026

Uh oh!

rust-bors bot commented Jan 24, 2026

Uh oh!

Uh oh!

nnethercote commented Jan 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

bjorn3 commented Jan 22, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jan 22, 2026

Uh oh!

rustbot commented Jan 22, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Veykril left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bjorn3 commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

petrochenkov commented Jan 23, 2026

Uh oh!

rust-bors bot commented Jan 23, 2026

Uh oh!

bjorn3 commented Jan 24, 2026

Uh oh!

rust-bors bot commented Jan 24, 2026

Uh oh!

Uh oh!

nnethercote commented Jan 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

bjorn3 commented Jan 22, 2026 •

edited by rustbot

Loading

Veykril left a comment •

edited by rustbot

Loading

bjorn3 commented Jan 23, 2026 •

edited

Loading