Skip to content

BTreeMap: test invariants more thoroughly and more readably#77612

Merged
bors merged 1 commit intorust-lang:masterfrom
ssomers:btree_cleanup_2
Oct 20, 2020
Merged

BTreeMap: test invariants more thoroughly and more readably#77612
bors merged 1 commit intorust-lang:masterfrom
ssomers:btree_cleanup_2

Conversation

@ssomers
Copy link
Contributor

@ssomers ssomers commented Oct 6, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 6, 2020
ssomers
ssomers commented Oct 6, 2020
View reviewed changes
@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs Relevant to the library team, which will review and decide on the PR/issue. A-testsuite Area: The testsuite used to check the correctness of rustc labels Oct 6, 2020
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 13, 2020
@ssomers ssomers mentioned this pull request Oct 14, 2020
Merged
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 14, 2020
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Oct 15, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 15, 2020

📌 Commit f4034eb has been approved by Mark-Simulacrum

@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 Oct 15, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 15, 2020
@JohnTitor
Rollup merge of rust-lang#77612 - ssomers:btree_cleanup_2, r=Mark-Sim…
db8b2cd 
…ulacrum

BTreeMap: test invariants more thoroughly and more readably

r? @Mark-Simulacrum
@JohnTitor JohnTitor mentioned this pull request Oct 15, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 15, 2020
@Dylan-DPC
Rollup merge of rust-lang#77612 - ssomers:btree_cleanup_2, r=Mark-Sim…
284f1df 
…ulacrum

BTreeMap: test invariants more thoroughly and more readably

r? @Mark-Simulacrum
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Oct 15, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 16, 2020
@Dylan-DPC
Rollup merge of rust-lang#77935 - ssomers:btree_cleanup_1, r=Mark-Sim…
b64b5fa 
…ulacrum

BTreeMap: make PartialCmp/PartialEq explicit and tested

Follow-up on a topic raised in rust-lang#77612

r? @Mark-Simulacrum
@bors
Copy link
Collaborator

bors commented Oct 16, 2020

☔ The latest upstream changes (presumably #78001) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 16, 2020
@ssomers
Copy link
Contributor Author

ssomers commented Oct 16, 2020

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 16, 2020
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Oct 19, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 19, 2020

📌 Commit 488b999 has been approved by Mark-Simulacrum

@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 Oct 19, 2020
@JohnTitor JohnTitor mentioned this pull request Oct 20, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 20, 2020
@bors
Auto merge of rust-lang#78127 - JohnTitor:rollup-p1bxtqq, r=JohnTitor
c9b5210 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#77612 (BTreeMap: test invariants more thoroughly and more readably)
 - rust-lang#77761 (Assert that pthread mutex initialization succeeded)
 - rust-lang#77778 ([x.py setup] Allow setting up git hooks from other worktrees)
 - rust-lang#77838 (const keyword: brief paragraph on 'const fn')
 - rust-lang#77923 ([net] apply clippy lints)
 - rust-lang#77931 (Fix false positive for `unused_parens` lint)
 - rust-lang#77959 (Tweak ui-tests structure)
 - rust-lang#78105 (change name in .mailmap)
 - rust-lang#78111 (Trait predicate ambiguities are not always in `Self`)
 - rust-lang#78121 (Do not ICE on pattern that uses a binding multiple times in generator)

Failed merges:

r? `@ghost`
@bors bors merged commit c5b0a88 into rust-lang:master Oct 20, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 20, 2020
@ssomers ssomers deleted the btree_cleanup_2 branch October 20, 2020 07:17
@ssomers ssomers mentioned this pull request Oct 24, 2020
Merged
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 25, 2020
@JohnTitor
Rollup merge of rust-lang#78322 - ssomers:btree_no_min_len_at_node_le…
9085656 
…vel, r=Mark-Simulacrum

BTreeMap: stop mistaking node::MIN_LEN for a node level constraint

Correcting rust-lang#77612 that fell into the trap of assuming that node::MIN_LEN is an imposed minimum everywhere, and trying to make it much more clear it is an offered minimum at the node level.

r? @Mark-Simulacrum
@ssomers ssomers mentioned this pull request Oct 27, 2020
Merged
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 6, 2020
@Dylan-DPC
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
d22cc21 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? `@Mark-Simulacrum`
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
7c1ec23 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? ``@Mark-Simulacrum``
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
01db421 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? ```@Mark-Simulacrum```
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
51e92af 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? ````@Mark-Simulacrum````
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
10ea17b 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? `````@Mark-Simulacrum`````
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 8, 2020
@Dylan-DPC
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
ed10eba 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? ``````@Mark-Simulacrum``````
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 8, 2020
@Dylan-DPC
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
f9c2a5d 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? ```````@Mark-Simulacrum```````
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 9, 2020
@Dylan-DPC
Rollup merge of rust-lang#78437 - ssomers:btree_no_ord_at_node_level,…
4e5b7ad 
… r=Mark-Simulacrum

BTreeMap: stop mistaking node for an orderly place

A second mistake in rust-lang#77612 was to ignore the node module's rightful comment "this module doesn't care whether the entries are sorted". And there's a much simpler way to visit the keys in order, if you check this separately from a single pass checking everything.

r? ````````@Mark-Simulacrum````````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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

Milestone

1.49.0

Development

Successfully merging this pull request may close these issues.

6 participants

@ssomers @Mark-Simulacrum @bors @rust-highfive @jyn514 @rustbot