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 commented Mar 6, 2020

Fixes #69769

@jonas-schievink

This comment has been minimized.

Copy link
Member

jonas-schievink commented Mar 6, 2020

@jonas-schievink

This comment has been minimized.

Copy link
Member

jonas-schievink commented Mar 6, 2020

Did you mean to refer to #69769 instead?

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

Mark-Simulacrum commented Mar 7, 2020

@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

This comment has been minimized.

Copy link
Contributor

bors commented Mar 7, 2020

📌 Commit 44c97c4 has been approved by Mark-Simulacrum

@bors

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor

bors commented Mar 8, 2020

⌛️ Testing commit 44c97c4 with merge 76adeb8...

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

Fixes #69769
@Dylan-DPC

This comment has been minimized.

Copy link
Member

Dylan-DPC commented Mar 8, 2020

@bors retry

yielding to rollup

1 similar comment
@Dylan-DPC

This comment has been minimized.

Copy link
Member

Dylan-DPC commented Mar 8, 2020

@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)
 - #69561 (Clean up unstable book)
 - #69599 (check_binding_alt_eq_ty: improve precision wrt. `if let`)
 - #69641 (Update books)
 - #69646 (Miri visitor: detect primitive types based on type, not layout (also, more tests))
 - #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 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
4 of 5 checks passed
4 of 5 checks passed
homu Testing commit 44c97c43b5d3df5d76381f80fb8ad0042c6ccf55 with merge 76adeb848764611f713e37b9d8ce7920e0e4cb32...
Details
pr Build #20200306.29 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
@ssomers ssomers deleted the ssomers:fix69769 branch Mar 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

6 participants
You can’t perform that action at this time.