Skip to content

Handle same-crate macro for borrowck semicolon suggestion #142584

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
Merged
merged 1 commit into from
Jun 17, 2025
Merged

Handle same-crate macro for borrowck semicolon suggestion #142584

merged 1 commit into from
Jun 17, 2025
+65 −120

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Jun 16, 2025

@rustbot
Copy link
Collaborator

rustbot commented Jun 16, 2025

fmease is not on the review rotation at the moment.
They may take a while to respond.

@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. labels Jun 16, 2025
@Urgau Urgau force-pushed the span-borrowck-139049 branch from 6ff16d3 to 55b745e Compare June 16, 2025 16:49
fmease
fmease approved these changes Jun 16, 2025
View reviewed changes
tests/ui/borrowck/span-semicolon-issue-139049.rs Outdated
}
// You could assume that this comes from an extern crate (it doesn't
// because an aux crate would be overkill for this test).
macro_rules! perform {
Copy link
Member

Choose a reason for hiding this comment

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

The docs of find_oldest_ancestor_in_same_ctxt talk about "local" macro expansions. Does it nevertheless mean that we can peel away macros from external crates (since the actual expansion still happens locally)? I assume that's the case.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I made sure it didn't regress the previous test, even if we don't have it anymore.

@fmease
Copy link
Member

fmease commented Jun 16, 2025 •
edited
Loading

Thanks a lot for following up on this! Highly appreciated.

@bors rollup
r=me once green 🟢 or right away

@fmease
Copy link
Member

fmease commented Jun 16, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 16, 2025

📌 Commit 55b745e has been approved by fmease

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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 16, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@fmease
Copy link
Member

fmease commented Jun 16, 2025

@bors r-

@bors 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 Jun 16, 2025
@Urgau Urgau force-pushed the span-borrowck-139049 branch from 55b745e to 994794a Compare June 16, 2025 17:58
@Urgau
Copy link
Member Author

Urgau commented Jun 16, 2025

@bors r=fmease

@bors
Copy link
Collaborator

bors commented Jun 16, 2025

📌 Commit 994794a has been approved by fmease

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 Jun 16, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 17, 2025
@jhpratt
Rollup merge of rust-lang#142584 - Urgau:span-borrowck-139049, r=fmease
70320e7 
Handle same-crate macro for borrowck semicolon suggestion

Handles rust-lang#142543 (comment)

cc `@m-ou-se`
r? `@fmease`
@jhpratt jhpratt mentioned this pull request Jun 17, 2025
Closed
bors added a commit that referenced this pull request Jun 17, 2025
@bors
Auto merge of #142604 - jhpratt:rollup-77fsgte, r=jhpratt
896d9e4 
Rollup of 11 pull requests

Successful merges:

 - #140809 (Reduce special casing for the panic runtime)
 - #141608 (Add support for repetition to `proc_macro::quote`)
 - #141864 (Handle win32 separator for cygwin paths)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142517 (Windows: Use anonymous pipes in Command)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)
 - #142585 (Update books)
 - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - #142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - #142598 (Set elf e_flags on ppc64 targets according to abi)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee workingjubilee mentioned this pull request Jun 17, 2025
Merged
rust-bors bot added a commit that referenced this pull request Jun 17, 2025
@rust-bors
Auto merge of #142613 - workingjubilee:rollup-yuod2hg, r=<try>
69b2373 
Rollup of 13 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)
 - #142585 (Update books)
 - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - #142587 (Make sure to propagate result from `visit_expr_fields`)
 - #142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - #142598 (Set elf e_flags on ppc64 targets according to abi)
 - #142601 (Add a comment to `FORMAT_VERSION`.)

r? `@ghost`
`@rustbot` modify labels: rollup
<!-- homu-ignore:start -->
[Create a similar rollup](https://bors.rust-lang.org/queue/rust?prs=138538,141946,142216,142542,142563,142570,142584,142585,142586,142587,142595,142598,142601)
<!-- homu-ignore:end -->
try-job: dist-apple-various
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 17, 2025
@workingjubilee
Rollup merge of rust-lang#142584 - Urgau:span-borrowck-139049, r=fmease
c79a6c0 
Handle same-crate macro for borrowck semicolon suggestion

Handles rust-lang#142543 (comment)

cc ```@m-ou-se```
r? ```@fmease```
@workingjubilee workingjubilee mentioned this pull request Jun 17, 2025
Open
bors added a commit that referenced this pull request Jun 17, 2025
@bors
Auto merge of #142614 - workingjubilee:rollup-g5qf7y3, r=workingjubilee
1b4aa42 
Rollup of 10 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142371 (avoid `&mut P<T>` in `visit_expr` etc methods)
 - #142377 (Try unremapping compiler sources)
 - #142517 (Windows: Use anonymous pipes in Command)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-bors bot added a commit that referenced this pull request Jun 17, 2025
@rust-bors
Auto merge of #142614 - workingjubilee:rollup-g5qf7y3, r=<try>
a62049a 
Rollup of 10 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142371 (avoid `&mut P<T>` in `visit_expr` etc methods)
 - #142377 (Try unremapping compiler sources)
 - #142517 (Windows: Use anonymous pipes in Command)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
<!-- homu-ignore:start -->
[Create a similar rollup](https://bors.rust-lang.org/queue/rust?prs=138538,141946,142216,142371,142377,142517,142542,142563,142570,142584)
<!-- homu-ignore:end -->
try-job: dist-aarch64-apple
bors added a commit that referenced this pull request Jun 17, 2025
@bors
Auto merge of #142613 - workingjubilee:rollup-yuod2hg, r=workingjubilee
f3db639 
Rollup of 13 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)
 - #142585 (Update books)
 - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - #142587 (Make sure to propagate result from `visit_expr_fields`)
 - #142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - #142598 (Set elf e_flags on ppc64 targets according to abi)
 - #142601 (Add a comment to `FORMAT_VERSION`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b27b74f into rust-lang:master Jun 17, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 17, 2025
rust-timer added a commit that referenced this pull request Jun 17, 2025
@rust-timer
Unrolled build for #142584
746e56f 
Rollup merge of #142584 - Urgau:span-borrowck-139049, r=fmease

Handle same-crate macro for borrowck semicolon suggestion

Handles #142543 (comment)

cc ``@m-ou-se``
r? ``@fmease``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

Labels
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.
Projects
None yet
Milestone
1.89.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Urgau @rustbot @fmease @bors @rust-log-analyzer