Replace unwraps with expects in bevy_asset #3892
Closed
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
alice-i-cecile
added
A-Assets
rparrett
reviewed
Feb 8, 2022
| @@ -358,7 +362,7 @@ impl AssetServer { | |||
| self.server | |||
| .asset_io | |||
| .watch_path_for_changes(asset_path.path()) | |||
| .unwrap(); | |||
| .expect("Could not watch path for changes."); | |||
There was a problem hiding this comment.
Seems like this one could be .watch_path_for_changes(asset_path.path())?;
| @@ -399,7 +403,9 @@ impl AssetServer { | |||
| let path = path.as_ref(); | |||
| if !self.server.asset_io.is_directory(path) { | |||
| return Err(AssetServerError::AssetFolderNotADirectory( | |||
| path.to_str().unwrap().to_string(), | |||
| path.to_str() | |||
| .expect("Could not convert path to string.") | |||
There was a problem hiding this comment.
Seems like this should only fail if the path has invalid utf8, so the message could be made more specific.
Yep; that's my next pass for this PR. |
IceSentry
reviewed
Feb 8, 2022
Co-authored-by: Charles <[email protected]>
|
Sorry, my mistake, the method is unwrap_or_else() not expect_or_else. My local setup is giving me some issues and I didn't notice the mistake. |
IceSentry
reviewed
Feb 8, 2022
Co-authored-by: Charles <[email protected]>
ghost
mentioned this pull request
31 tasks
|
Closing per discussion in #3899. |
bors bot
pushed a commit
that referenced
this pull request
May 2, 2022
# Objective - Manually running systems is a somewhat obscure process: systems must be initialized before they are run - The unwrap is rather hard to debug. ## Solution - Replace unwraps in `FunctionSystem` methods with expects (progress towards #3892). - Briefly document this requirement.
exjam
pushed a commit
to exjam/bevy
that referenced
this pull request
May 22, 2022
…ine#3947) # Objective - Manually running systems is a somewhat obscure process: systems must be initialized before they are run - The unwrap is rather hard to debug. ## Solution - Replace unwraps in `FunctionSystem` methods with expects (progress towards bevyengine#3892). - Briefly document this requirement.
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
…ine#3947) # Objective - Manually running systems is a somewhat obscure process: systems must be initialized before they are run - The unwrap is rather hard to debug. ## Solution - Replace unwraps in `FunctionSystem` methods with expects (progress towards bevyengine#3892). - Briefly document this requirement.
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.
Objective
Solution
Meta
This is a very basic, mechanical pass to improve error handling.
I don't currently have a deep understanding of the internals (and they're likely to change), so the error messages provided are very localized. It would be nice to capture more information about the state in these expect messages as well before merging.
There are a few wasm-specific unwraps left in
wasm_asset_io.rsthat I didn't feel comfortable tackling. There are also some expects in test code left, which I felt were fine to keep.Like always, improvements are very welcome.