BTreeMap: correct way to postpone root access in DrainFilter#75487
Closed
ssomers wants to merge 1 commit intorust-lang:masterfrom
ssomers:btree_fix_75257_standalone
Closed
BTreeMap: correct way to postpone root access in DrainFilter#75487ssomers wants to merge 1 commit intorust-lang:masterfrom ssomers:btree_fix_75257_standalone
ssomers wants to merge 1 commit intorust-lang:masterfrom
ssomers:btree_fix_75257_standalone
Conversation
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 15, 2020
…mulacrum Revert the fundamental changes in rust-lang#74762 and rust-lang#75257 Before possibly going over to rust-lang#75487. Also contains some added and fixed comments. r? @Mark-Simulacrum
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.
The
DrainFilteriterator no longer removed empty internal roots, because thecur_leaf_edgein the drop handler did not contain an edge (except after panic in drop). And it only tried to remove a single internal root, while a huge tree can be drained down to any height.This fixes that problem, but not if someone
mem::forgets the iterator. It's more a proof of concept than lunch, while the real food is still cooking on the test machine.r? @Mark-Simulacrum