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

don't suggest move for borrows that aren't closures #113137

Merged
merged 1 commit into from Jun 29, 2023
Merged

don't suggest move for borrows that aren't closures #113137

merged 1 commit into from Jun 29, 2023

Conversation

lukas-code
Copy link
Contributor

fixes #113087

@rustbot
Copy link
Collaborator

rustbot commented Jun 28, 2023

r? @b-naber

(rustbot has picked a reviewer for you, use r? to override)

@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 28, 2023
compiler-errors
compiler-errors reviewed Jun 28, 2023
View reviewed changes
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated
&format!("`{}`", name),
"block",
),
) if borrow_spans.for_generator() | borrow_spans.for_closure() => self
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
) if borrow_spans.for_generator() | borrow_spans.for_closure() => self
) if borrow_spans.for_generator() || borrow_spans.for_closure() => self

@compiler-errors
Copy link
Member

please squash this into one commit, then r=me

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 28, 2023

📌 Commit 5e83ddd has been approved by compiler-errors

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 28, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 29, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2023
@bors
Auto merge of rust-lang#113146 - matthiaskrgr:rollup-bxtr51e, r=matth…
0a32ca9 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#112670 (privacy: Type privacy lints fixes and cleanups)
 - rust-lang#112929 (Test that we require implementing trait items whose bounds don't hold in the current impl)
 - rust-lang#113054 (Make `rustc_on_unimplemented` std-agnostic)
 - rust-lang#113137 (don't suggest `move` for borrows that aren't closures)
 - rust-lang#113139 (style-guide: Clarify let-else further)
 - rust-lang#113140 (style-guide: Add an example of formatting a multi-line attribute)
 - rust-lang#113143 (style-guide: Narrow guidance about references and dereferencing)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7e1869f into rust-lang:master Jun 29, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 29, 2023
@lukas-code lukas-code deleted the no-moving-references branch June 29, 2023 10:10
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

@compiler-errors compiler-errors

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

Successfully merging this pull request may close these issues.

move recommendation with closure and invalid lifetime is inserted at the wrong place
5 participants
@lukas-code @rustbot @compiler-errors @bors @b-naber