Skip to content

More proc macro tweaks #97445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

More proc macro tweaks #97445

wants to merge 3 commits into from

Conversation

nnethercote
Copy link
Contributor

A follow-up to #97004.

r? @eddyb

@rust-highfive
Copy link
Contributor

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs to request review from a libs-api team reviewer. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 27, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 27, 2022
@nnethercote
Copy link
Contributor Author

The first 12 commits are duplicates from #97004. Once it merges I will rebase and they will disappear.

@nnethercote nnethercote mentioned this pull request May 27, 2022
Merged
bjorn3
bjorn3 reviewed May 27, 2022
View reviewed changes
library/proc_macro/src/bridge/server.rs
static COUNTERS: HandleCounters = HandleCounters {
$($oty: AtomicUsize::new(1),)*
$($ity: AtomicUsize::new(1),)*
};
Copy link
Member

Choose a reason for hiding this comment

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

cc #97004 (comment)

@bors
Copy link
Collaborator

bors commented May 27, 2022

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

@nnethercote nnethercote force-pushed the proc-macro-tweaks-2 branch from 5999b03 to 6a30c8e Compare May 27, 2022 09:39
@bors
Copy link
Collaborator

bors commented May 28, 2022

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

@nnethercote
Inline and remove Bridge::enter.
3356d66 
It has a single callsite.
@nnethercote
Move HandleStore into server.rs.
0d7dfae 
This fixes two `FIXME` comments, and makes things clearer, by not having
server code in `client.rs`.
@nnethercote
Move counters into server.rs.
a59bb6d 
This simplifies things considerably.
@nnethercote nnethercote force-pushed the proc-macro-tweaks-2 branch from 6a30c8e to a59bb6d Compare June 10, 2022 03:21
@bors
Copy link
Collaborator

bors commented Jun 18, 2022

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

@nnethercote nnethercote mentioned this pull request Jun 19, 2022
Closed
@dacut dacut mentioned this pull request Jul 8, 2022
Closed
@JohnCSimon
Copy link
Member

ping from triage:
@nnethercote
Returning to author to address merge conflicts.

FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.

@rustbot author

@rustbot rustbot 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 Jul 24, 2022
@nnethercote
Copy link
Contributor Author

This is blocked waiting on #98223 to be merged. (The author of that PR is the same as the reviewer for this PR.)

@camelid camelid 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 11, 2023
@Dylan-DPC Dylan-DPC added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 13, 2023
@nnethercote
Copy link
Contributor Author

I'm closing this. The first commit is now irrelevant, I've ported the second to #121835, and the third is dubious.

@nnethercote nnethercote closed this Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@eddyb eddyb

Labels
S-blocked Status: Blocked on something else such as an RFC or other implementation work. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@nnethercote @rust-highfive @bors @JohnCSimon @bjorn3 @eddyb @camelid @rustbot @Dylan-DPC