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

In BTreeMap's merge function, adjust the length of the node before mo… #31038

Merged
merged 1 commit into from
Jan 20, 2016

Conversation

gereeter
Copy link
Contributor

…ving elements into it.

Fixes #31029.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alexcrichton
Copy link
Member

r? @gankro

@rust-highfive rust-highfive assigned Gankra and unassigned brson Jan 20, 2016
@Gankra
Copy link
Contributor

Gankra commented Jan 20, 2016

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jan 20, 2016

📌 Commit 707afa2 has been approved by Gankro

@Gankra
Copy link
Contributor

Gankra commented Jan 20, 2016

Just to be clear: this wasn't actually a soundness issue, right? This was just tripping internal asserts because metadata was being updated too late?

@bors
Copy link
Contributor

bors commented Jan 20, 2016

⌛ Testing commit 707afa2 with merge c4c9628...

bors added a commit that referenced this pull request Jan 20, 2016
1 similar comment
@bors bors merged commit 707afa2 into rust-lang:master Jan 20, 2016
@gereeter
Copy link
Contributor Author

@gankro Yes, exactly - this was not a soundness issue.

@gereeter gereeter deleted the btree-panic branch January 20, 2016 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants