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 btree CursorMut::insert_after check #110234

Merged
merged 1 commit into from
Apr 13, 2023

Conversation

marc0246
Copy link
Contributor

Fixes a check inside BTreeMap's CursorMut::insert_after, where it would peek the previous element to check whether the inserted key is below the next one, instead of peeking the next element.

@rustbot
Copy link
Collaborator

rustbot commented Apr 12, 2023

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

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 12, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 12, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@cuviper
Copy link
Member

cuviper commented Apr 12, 2023

Would you be willing to add #[should_panic] tests for insert_before and insert_after?

@marc0246
Copy link
Contributor Author

Sure thing, where would the place for that be?

@cuviper
Copy link
Member

cuviper commented Apr 12, 2023

In library/alloc/src/collections/btree/map/tests.rs, put them at the end near the positive test_cursor_mut. There are other examples of should_panic in that file -- remember that you only get one panic per test that way. Or you can write a single test that manually uses catch_unwind around each panic, if that feels better.

@marc0246
Copy link
Contributor Author

Alrighty, I think I did it right, let's see what the CI thinks.

@cuviper
Copy link
Member

cuviper commented Apr 12, 2023

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 12, 2023

📌 Commit cdd9829 has been approved by cuviper

It is now in the queue for this repository.

@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 Apr 12, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 13, 2023
…=cuviper

Fix btree `CursorMut::insert_after` check

Fixes a check inside `BTreeMap`'s `CursorMut::insert_after`, where it would peek the previous element to check whether the inserted key is below the next one, instead of peeking the next element.
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#110072 (Stabilize IsTerminal)
 - rust-lang#110195 (Erase lifetimes above `ty::INNERMOST` when probing ambiguous types)
 - rust-lang#110218 (Remove `ToRegionVid`)
 - rust-lang#110220 (cleanup our region error API)
 - rust-lang#110234 (Fix btree `CursorMut::insert_after` check)
 - rust-lang#110262 (Update unwind_safe.rs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 209e6d9 into rust-lang:master Apr 13, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 13, 2023
@marc0246 marc0246 deleted the btree-insert-after-fix branch April 13, 2023 12:23
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants