Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix & test leak of some BTreeMap nodes on panic during into_iter #69776

Merged
merged 1 commit into from
Mar 8, 2020

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Mar 6, 2020

Fixes #69769

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 6, 2020
@jonas-schievink
Copy link
Contributor

r? @Mark-Simulacrum

@jonas-schievink
Copy link
Contributor

Did you mean to refer to #69769 instead?

@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

(Bumping priority up because I'd like this to get in before we branch beta, but it can be rolled up).

@bors
Copy link
Contributor

bors commented Mar 7, 2020

📌 Commit 44c97c4 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 7, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 7, 2020
@bors
Copy link
Contributor

bors commented Mar 8, 2020

⌛ Testing commit 44c97c4 with merge 76adeb848764611f713e37b9d8ce7920e0e4cb32...

@Dylan-DPC-zz
Copy link

@bors retry

yielding to rollup

1 similar comment
@Dylan-DPC-zz
Copy link

@bors retry

yielding to rollup

Centril added a commit to Centril/rust that referenced this pull request Mar 8, 2020
Fix & test leak of some BTreeMap nodes on panic during `into_iter`

Fixes rust-lang#69769
bors added a commit that referenced this pull request Mar 8, 2020
Rollup of 8 pull requests

Successful merges:

 - #69422 (Remove use of `unwrap()` from save-analysis)
 - #69548 (Turn trailing tokens in `assert!()` into hard errors)
 - #69561 (Clean up unstable book)
 - #69599 (check_binding_alt_eq_ty: improve precision wrt. `if let`)
 - #69641 (Update books)
 - #69776 (Fix & test leak of some BTreeMap nodes on panic during `into_iter`)
 - #69805 (resolve: Modernize some naming)
 - #69810 (test(bindings_after_at): add dynamic drop tests for bindings_after_at)

Failed merges:

r? @ghost
@bors bors merged commit f497325 into rust-lang:master Mar 8, 2020
@ssomers ssomers deleted the fix69769 branch March 9, 2020 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BTreeMap root node leaks on panic during into_iter
6 participants