Fix get_asset_paths not properly deleting empty folders (& recursive async functions)#12638
Merged
james7132 merged 2 commits intobevyengine:mainfrom Mar 23, 2024
Merged
Conversation
Rust 1.77 now allows recursive async functions (albeit still by boxing), hurray!
alice-i-cecile
approved these changes
Mar 22, 2024
Contributor
bushrat011899
left a comment
There was a problem hiding this comment.
Really clean! On review of the AssetProcessor::initialize method, I think you've stumbled across an error in the implementation of get_asset_paths. I've included my reasoning for believing this is an error, but it may require a second pair of eyes to confirm I haven't missed something.
james7132
approved these changes
Mar 23, 2024
bushrat011899
approved these changes
Mar 23, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Objective
get_asset_paths tries to check whether a folder is empty, and if so delete it. However rather than checking whether any subfolder contains files it checks whether all subfolders have files.
Also cleanup various BoxedFutures in async recursive functions like these, rust 1.77 now allows recursive async functions (albeit still by boxing), hurray! This is a followup to #12550 (sorta). More BoxedFuture stuff can be removed now that rust 1.77 is out, which can use async recursive functions! This is mainly just cleaner code wise - the recursion still boxes the future so not much to win there.
PR is mainly whitespace changes so do disable whitespace diffs for easier review.