ignore: fix panic in walk iterator when min_depth skips root#3319
Open
majiayu000 wants to merge 1 commit intoBurntSushi:masterfrom
Open
ignore: fix panic in walk iterator when min_depth skips root#3319majiayu000 wants to merge 1 commit intoBurntSushi:masterfrom
majiayu000 wants to merge 1 commit intoBurntSushi:masterfrom
Conversation
When min_depth > 0, WalkDir skips the root entry at depth 0, so Walk never calls add_child() for it. But WalkEventIter still emits an Exit event for the root directory. The unwrap() on parent() panics because self.ig has no parent at the root level. Replace unwrap() with an if-let guard that simply skips the pop when there is no parent. Closes BurntSushi#3286 Signed-off-by: majiayu000 <1835304752@qq.com>
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
1 participant
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.
Summary
self.ig.parent().unwrap()whenmin_depth > 0causes the root entry to be skippedmin_depth > 0,WalkDirnever yields the root at depth 0, soadd_child()is never called for it. ButWalkEventIterstill emits anExitevent, andparent()returnsNonesinceself.igis already at the root levelunwrap()withif let Some(parent)guard to skip the pop when there is no parentTest plan
min_depth_max_depth_no_panicregression test covering both single-threaded and parallel walkscargo test --workspace— all tests passcargo fmt --all --check— cleancargo build --workspace— cleanCloses #3286