Remove an unnecessary unwrap in rustc_codegen_gcc
#149449
Merged
+2
−2
Conversation
This file contains hidden or 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
Collaborator
|
Some changes occurred in compiler/rustc_codegen_gcc |
rustbot
added
S-waiting-on-review
Member
|
Yeah, it should be fine. @bors r+ |
Collaborator
bors
added
S-waiting-on-bors
rust-timer
added a commit
that referenced
this pull request
Nov 29, 2025
Rollup merge of #149449 - AudaciousAxiom:refactor/rustc-codegen-gcc-remove-unnecessary-unwrap, r=workingjubilee Remove an unnecessary `unwrap` in `rustc_codegen_gcc` This should hopefully unblock #149425 (I couldn't find an in-flight PR that was already doing this). I've tested locally with the `master` version of Clippy that `rustc_codegen_gcc` passes the lints (the syncing PR could still fail for other reasons however). I understand that `rustc_codegen_gcc` is normally developed [outside of this repo](https://github.com/rust-lang/rustc_codegen_gcc) but my understanding is that that repo is two-way synced regularly and hopefully it is acceptable to do this tiny change here to unblock the Clippy syncing PR (is there an established process for how to unblock these syncing PRs?). Of course feel free to close if this isn't the expected process.
antoyo
reviewed
Nov 29, 2025
Comment on lines
+506
to
509
| if let Some(location) = bx.location { | ||
| #[cfg(feature = "master")] | ||
| rvalue.set_location(bx.location.unwrap()); | ||
| rvalue.set_location(location); | ||
| } |
Contributor
There was a problem hiding this comment.
It's probably going to cause some clippy failures on our side, though.
Better would have been:
Suggested change
| if let Some(location) = bx.location { | |
| #[cfg(feature = "master")] | |
| rvalue.set_location(bx.location.unwrap()); | |
| rvalue.set_location(location); | |
| } | |
| #[cfg(feature = "master")] | |
| if let Some(location) = bx.location { | |
| rvalue.set_location(location); | |
| } |
Member
There was a problem hiding this comment.
Hm. It seems unlikely that it would do so, @antoyo, given it fixes a clippy lint? But I will try to pay closer attention to the cfg on any PRs in this area.
Member
There was a problem hiding this comment.
I suppose it might seem weird as an "empty" conditional?
Contributor
There was a problem hiding this comment.
When the feature master is disabled, the variable location is unused. That might even be a compiler warning instead of a clippy warning.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
This should hopefully unblock #149425 (I couldn't find an in-flight PR that was already doing this).
I've tested locally with the
masterversion of Clippy thatrustc_codegen_gccpasses the lints (the syncing PR could still fail for other reasons however).I understand that
rustc_codegen_gccis normally developed outside of this repo but my understanding is that that repo is two-way synced regularly and hopefully it is acceptable to do this tiny change here to unblock the Clippy syncing PR (is there an established process for how to unblock these syncing PRs?). Of course feel free to close if this isn't the expected process.r? @matthiaskrgr