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.

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

Workaround unstable stmt_expr_attributes for method receiver expressions #103430

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Workaround unstable stmt_expr_attributes for method receiver expressions #103430

merged 1 commit into from
Oct 26, 2022

Conversation

cjgillot
Copy link
Contributor

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 23, 2022
@rust-highfive
Copy link
Collaborator

r? @jackh726

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 23, 2022
@jackh726
Copy link
Member

Going to re-roll because I'm not familiar with this code.

r? rust-lang/compiler

@cjgillot cjgillot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 24, 2022
@petrochenkov
Copy link
Contributor

This seems to be a major overkill, I think adding only fn visit_method_receiver_expr and not calling maybe_emit_expr_attr_err in it in InvocationCollector should be enough?

@petrochenkov 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 Oct 24, 2022
@cjgillot
Copy link
Contributor Author

This is the first thing I tried.
However, if the receiver is a macro expansion, we'll get an AstFragment::Expr, which does not know it comes from a method receiver. So it will call the regular visit_expr method, which triggers the feature gate.
The simplest solution would be to stabilize the feature, but t-lang probably won't let us backport that 😆.

@petrochenkov petrochenkov 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 Oct 25, 2022
@petrochenkov
Copy link
Contributor

Ugh and sigh.
@bors r+

@bors
Copy link
Contributor

bors commented Oct 25, 2022

📌 Commit 74d4eef has been approved by petrochenkov

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 Oct 25, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Oct 25, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Oct 25, 2022
@Dylan-DPC
Rollup merge of rust-lang#103430 - cjgillot:receiver-attrs, r=petroch…
af5ef92 
…enkov

Workaround unstable stmt_expr_attributes for method receiver expressions

Fixes rust-lang#103244

cc `@Mark-Simulacrum` `@ehuss`
@Dylan-DPC Dylan-DPC mentioned this pull request Oct 26, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 26, 2022
@bors
Auto merge of rust-lang#103562 - Dylan-DPC:rollup-sheepp5, r=Dylan-DPC
629a414 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#102951 (suggest type annotation for local statement initialed by ref expression)
 - rust-lang#103209 (Diagnostic derives: allow specifying multiple alternative suggestions)
 - rust-lang#103287 (Use a faster allocation size check in slice::from_raw_parts)
 - rust-lang#103416 (Name the `impl Trait` in region bound suggestions)
 - rust-lang#103430 (Workaround unstable stmt_expr_attributes for method receiver expressions)
 - rust-lang#103444 (Remove extra type error after missing semicolon error)
 - rust-lang#103520 (rustc_middle: Rearrange resolver outputs structures slightly)
 - rust-lang#103533 (Use &self instead of &mut self for cast methods)
 - rust-lang#103536 (Remove `rustc_driver::set_sigpipe_handler()`)
 - rust-lang#103542 (Pinning tests for some `macro_rules!` errors discussed in the lang meeting)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c9a04cd into rust-lang:master Oct 26, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 26, 2022
@cjgillot cjgillot deleted the receiver-attrs branch October 26, 2022 11:45
@compiler-errors compiler-errors mentioned this pull request Oct 27, 2022
Merged
@pnkfelix
Copy link
Member

pnkfelix commented Oct 27, 2022 •
edited
Loading

Discussed in today's T-compiler triage meeting

We decided to first look into reverting PR #100232 (see in PR #103633) before falling back on risking a beta backport of this PR #103430.

(Thus, I'm not removing the nomination label until #103633 lands, but I'm not adding a beta-accepted label either.)

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 28, 2022
@bors
Auto merge of rust-lang#103633 - compiler-errors:beta-revert-rcvr-arg…
636a78a 
…s-split, r=pnkfelix

Revert "Do not consider method call receiver as an argument in AST."

Reverts rust-lang#100232, including a few places where there were merge conflicts after this landed.

r? `@pnkfelix`
cc `@cjgillot`

cc rust-lang#103430 the nightly workaround for this issue.
@Mark-Simulacrum
Copy link
Member

Dropping beta-nominated; we've reverted the problematic PR.

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 29, 2022
pietroalbini added a commit to ferrocene/sphinx-shared-resources that referenced this pull request Mar 22, 2023
@bors-ferrocene @Veykril
@pietroalbini @DropDemBits @bors
Merge #600
3f42cd2 
600: Pull changes from upstream `master` r=kirtchev-adacore a=pietroalbini

* rust-lang/rust#103605
* rust-lang/rust#103604
  * rust-lang/rust#103598
  * rust-lang/rust#103596
  * rust-lang/rust#103580
  * rust-lang/rust#103579
  * rust-lang/rust#103567
  * rust-lang/rust#103558
  * rust-lang/rust#103549
  * rust-lang/rust#103537
  * rust-lang/rust#103526
  * rust-lang/rust#103432
* rust-lang/rust#103571
* rust-lang/rust#103492
* rust-lang/rust#103572
  * rust-lang/rust#103554
  * rust-lang/rust#103546
  * rust-lang/rust#103543
  * rust-lang/rust#103428
  * rust-lang/rust#102706
  * rust-lang/rust#95710
* rust-lang/rust#103284
* rust-lang/rust#103562
  * rust-lang/rust#103542
  * rust-lang/rust#103536
  * rust-lang/rust#103533
  * rust-lang/rust#103520
  * rust-lang/rust#103444
  * rust-lang/rust#103430
  * rust-lang/rust#103416
  * rust-lang/rust#103287
  * rust-lang/rust#103209
  * rust-lang/rust#102951
* rust-lang/rust#103279
* rust-lang/rust#103158



Co-authored-by: Lukas Wirth <[email protected]>
Co-authored-by: Pietro Albini <[email protected]>
Co-authored-by: DropDemBits <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: Pietro Albini <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

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.66.0
Development

Successfully merging this pull request may close these issues.

regression: attributes on expressions are experimental
8 participants
@cjgillot @rust-highfive @jackh726 @petrochenkov @bors @pnkfelix @Mark-Simulacrum @rustbot