Skip to content
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.

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

Rename NestedMetaItem to MetaItemInner #131235

Merged

Conversation

codemountains
Copy link
Contributor

@rustbot
Copy link
Collaborator

rustbot commented Oct 4, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nnethercote (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 4, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 4, 2024

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rustbot
Copy link
Collaborator

rustbot commented Oct 4, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

The following commits are merge commits:

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 4, 2024
@bors
Copy link
Contributor

bors commented Oct 4, 2024

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

@codemountains codemountains force-pushed the rename-nestedmetaitem-to-metaitemlnner branch from 0aeb8b3 to 6dfc4a0 Compare October 6, 2024 14:31
@rustbot rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 6, 2024
@nnethercote
Copy link
Contributor

This is a good start! But for completeness there are some related names that should be changed as well. I grepped for nested_meta and found the following:

  • nested_meta variable names -> meta_item_inner or meta_inner or inner
  • parse_nested_meta method -> parse_meta_item_inner
    • often used with a nested closure argument -> inner
  • visit_nested_meta_item -> visit_meta_item_inner

Please change these. You can do them in a separate commit. A few of them are in rustfmt, but that's fine, you can change them in this PR. Thanks!

@nnethercote nnethercote 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 Oct 6, 2024
@codemountains
Copy link
Contributor Author

@nnethercote

Thank you for your thorough review! I appreciate your attention to detail. I've made most of the suggested changes, but there are a couple of exceptions I'd like to highlight:

  • parse_nested_meta method -> parse_meta_item_inner
    • often used with a nested closure argument -> inner
  • I haven't modified the parse_nested_meta method as it's part of the syn crate and not within our codebase to change.
    • The nested closure argument has been left as is because its type is ParseNestedMeta<'a>.

All other suggested changes have been implemented as requested.
Thank you again for your comprehensive review. Please let me know if you'd like me to make any further modifications or if you have any questions about the changes I've made.

@nnethercote
Copy link
Contributor

Looks good. The added nested_meta commits are all so small, they can be combined into a single commit. (Sorry if my previous suggestion wasn't clear about that.) Once that's done I think it's good to go.

@bors delegate=codemountains

@bors
Copy link
Contributor

bors commented Oct 7, 2024

✌️ @codemountains, you can now approve this pull request!

If @nnethercote told you to "r=me" after making some further change, please make that change, then do @bors r=@nnethercote

@codemountains codemountains force-pushed the rename-nestedmetaitem-to-metaitemlnner branch from 3394e7c to fc64ff7 Compare October 7, 2024 06:25
@codemountains
Copy link
Contributor Author

@nnethercote

Thank you for your review! I've addressed the changes as requested. I've combined all the small nested_meta commits into a single commit for better clarity and organization. I appreciate your guidance on this.

Please let me know if there's anything else you'd like me to adjust or if you have any questions.

@nnethercote
Copy link
Contributor

Thank you!

@bors r+

@bors
Copy link
Contributor

bors commented Oct 7, 2024

📌 Commit fc64ff7 has been approved by nnethercote

It is now in the queue for this repository.

@bors 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 Oct 7, 2024
@bors
Copy link
Contributor

bors commented Oct 7, 2024

⌛ Testing commit fc64ff7 with merge 0b16baa...

@bors
Copy link
Contributor

bors commented Oct 7, 2024

☀️ Test successful - checks-actions
Approved by: nnethercote
Pushing 0b16baa to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 7, 2024
@bors bors merged commit 0b16baa into rust-lang:master Oct 7, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 7, 2024
@codemountains codemountains deleted the rename-nestedmetaitem-to-metaitemlnner branch October 7, 2024 11:36
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0b16baa): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.4% [-0.4%, -0.4%] 1
All ❌✅ (primary) - - 0

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.76s -> 774.407s (-0.05%)
Artifact size: 329.55 MiB -> 329.55 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NestedMetaItem would be better named as MetaItemInner
5 participants