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

suggest type annotation for local statement initialed by ref expression #102951

Merged
merged 1 commit into from
Oct 26, 2022
Merged

suggest type annotation for local statement initialed by ref expression #102951

merged 1 commit into from
Oct 26, 2022

Conversation

SparrowLii
Copy link
Member

In a local statement with a type declaration, if a ref expression is used on the right side and not used on the left side, in addition to removing the & and &mut on the right side, we can add them on the left side alternatively
Fixes #102892

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

r? @estebank

(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 12, 2022
compiler-errors
compiler-errors reviewed Oct 13, 2022
View reviewed changes
compiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs Outdated
let suggest_annotation = match expr.peel_drop_temps().kind {
hir::ExprKind::AddrOf(hir::BorrowKind::Ref, hir::Mutability::Not, _) => "&",
hir::ExprKind::AddrOf(hir::BorrowKind::Ref, hir::Mutability::Mut, _) => "&mut ",
_ => return true,
Copy link
Member

Choose a reason for hiding this comment

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

This should return false, since we didn't actually suggest anything I think.

Copy link
Member Author

Choose a reason for hiding this comment

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

The err.span_suggestion statement above has made some modifications to err, I guess that might be the reason why we should return true here as well?

Copy link
Member

Choose a reason for hiding this comment

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

oh, didn't even see that. yeah, makes sense. 👍

@bors
Copy link
Contributor

bors commented Oct 21, 2022

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

@estebank
Copy link
Contributor

r=me after rebasing

@SparrowLii
Copy link
Member Author

@estebank Done. But I don't have the privilege so it still needs you to r+

@SparrowLii
Copy link
Member Author

@bors r=estebank

@bors
Copy link
Contributor

bors commented Oct 24, 2022

@SparrowLii: 🔑 Insufficient privileges: Not in reviewers

@compiler-errors
Copy link
Member

@bors r=estebank

@bors
Copy link
Contributor

bors commented Oct 24, 2022

📌 Commit 0fca075 has been approved by estebank

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 24, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Oct 25, 2022
@Dylan-DPC
Rollup merge of rust-lang#102951 - SparrowLii:type_annotation, r=este…
ba39aab 
…bank

suggest type annotation for local statement initialed by ref expression

In a local statement with a type declaration, if a ref expression is used on the right side and not used on the left side, in addition to removing the `&` and `&mut` on the right side, we can add them on the left side alternatively
Fixes rust-lang#102892
@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#102951 - SparrowLii:type_annotation, r=este…
9c2c8c0 
…bank

suggest type annotation for local statement initialed by ref expression

In a local statement with a type declaration, if a ref expression is used on the right side and not used on the left side, in addition to removing the `&` and `&mut` on the right side, we can add them on the left side alternatively
Fixes rust-lang#102892
@Dylan-DPC Dylan-DPC mentioned this pull request Oct 25, 2022
Closed
@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 bf6bfcd into rust-lang:master Oct 26, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 26, 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 <lukastw97@gmail.com>
Co-authored-by: Pietro Albini <pietro.albini@ferrous-systems.com>
Co-authored-by: DropDemBits <r3usrlnd@gmail.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: Pietro Albini <pietro@pietroalbini.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@estebank estebank

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.

vicious "add &" then "remove &" cycle of suggestions
6 participants
@SparrowLii @rust-highfive @bors @estebank @compiler-errors @rustbot