Remove suspicious unwraps added in 799027d #184
Merged
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
Regression from 799027d. Unwraps on a None value when doing the stale surface generation technique in Chatterino7 as described in Supreeeme#74, very consistent
The wl_keyboard Enter event, wl_keyboard Leave event, the wl_touch Self::Down event and the ServerState::reconfigure_window function had similar uses of `unwrap` which appear to not consider the distinct query preparation and query execution stages.
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.
Found this regression after crashing xwls about 2 seconds after opening Chaterino7 due to creating a stale surface. The offending
unwrapis hit since the querygetcall is what finds the stale surface, rather than the construction of the query inquery_one.I took a rough look over the rest of that commit, and found a few additional blocks structured the same way and refactored them to also account for the split in query construction and query execution failures.
Doing double
let elseis a smidge unergonomic, but the query has to be held for the duration of the things it gets, so probably not a better way.