Improve ManuallyDrop suggestion #90901
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @jackh726 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @estebank |
estebank
reviewed
Nov 15, 2021
Comment on lines
374
to
380
| let (field_span, ty_span) = | ||
| // We are currently checking the type this field came from, so it must be local. | ||
| if let Node::Field(field) = tcx.hir().get_if_local(field.did).unwrap() { | ||
| (field.span, field.ty.span) | ||
| } else { | ||
| unreachable!("mir field has to correspond to hir field"); | ||
| }; |
There was a problem hiding this comment.
Suggested change
| let (field_span, ty_span) = | |
| // We are currently checking the type this field came from, so it must be local. | |
| if let Node::Field(field) = tcx.hir().get_if_local(field.did).unwrap() { | |
| (field.span, field.ty.span) | |
| } else { | |
| unreachable!("mir field has to correspond to hir field"); | |
| }; | |
| let (field_span, ty_span) = match tcx.hir().get_if_local(field.did) { | |
| // We are currently checking the type this field came from, so it must be local. | |
| Some(Node::Field(field)) => (field.span, field.ty.span), | |
| _ => unreachable!("mir field has to correspond to hir field"), | |
| }; |
estebank
reviewed
Nov 15, 2021
| .span_note(field_span, "`std::mem::ManuallyDrop` can be used to wrap the type") | ||
| .multipart_suggestion_verbose( | ||
| "wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped", | ||
| vec![(ty_span, format!("std::mem::ManuallyDrop<{}>", field_ty))], |
There was a problem hiding this comment.
Suggested change
| vec![(ty_span, format!("std::mem::ManuallyDrop<{}>", field_ty))], | |
| vec![ | |
| (ty_span.shrink_to_lo(), "std::mem::ManuallyDrop<".to_string()), | |
| (ty_span.shrink_to_hi(), ">".to_string()), | |
| ], |
|
This is ready for rereview |
|
@bors r+ |
|
📌 Commit 62acf7f has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 17, 2021
…estebank Improve ManuallyDrop suggestion closes rust-lang#90585 * Fixes the recommended change to use ManuallyDrop as per the issue * Changes the note to a help * improves the span so it only points at the type.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 17, 2021
…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#89610 (warn on must_use use on async fn's) - rust-lang#90667 (Improve diagnostics when a static lifetime is expected) - rust-lang#90687 (Permit const panics in stable const contexts in stdlib) - rust-lang#90772 (Add Vec::retain_mut) - rust-lang#90861 (Print escaped string if char literal has multiple characters, but only one printable character) - rust-lang#90884 (Fix span for non-satisfied trivial trait bounds) - rust-lang#90900 (Remove workaround for the forward progress handling in LLVM) - rust-lang#90901 (Improve ManuallyDrop suggestion) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #90585