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.

Sign up for GitHub

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

Jump to bottom

BTreeMap: test chaotic ordering & other bits & bobs #78903

Merged
merged 1 commit into from
Nov 17, 2020
Merged

BTreeMap: test chaotic ordering & other bits & bobs #78903

merged 1 commit into from
Nov 17, 2020

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Nov 9, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 9, 2020
@jyn514 jyn514 added A-testsuite Area: The testsuite used to check the correctness of rustc T-libs Relevant to the library team, which will review and decide on the PR/issue. C-cleanup Category: PRs that clean code up or issues documenting cleanup. labels Nov 9, 2020
@bors
Copy link
Contributor

bors commented Nov 12, 2020

☔ The latest upstream changes (presumably #78956) 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

@ssomers ssomers force-pushed the btree_order_chaos_testing branch from 2dbc601 to 5bc78fb Compare November 12, 2020 09:22
@ssomers
Copy link
Contributor Author

ssomers commented Nov 12, 2020

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

@ssomers ssomers force-pushed the btree_order_chaos_testing branch from 5bc78fb to 8972bcb Compare November 12, 2020 15:19
@Mark-Simulacrum
Copy link
Member

@bors r

@bors
Copy link
Contributor

bors commented Nov 15, 2020

📌 Commit 8972bcb 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 Nov 15, 2020
@m-ou-se m-ou-se mentioned this pull request Nov 16, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 16, 2020
@bors
Auto merge of rust-lang#79104 - m-ou-se:rollup-v74492y, r=m-ou-se
c6a6105 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#74989 (Implement `Index` and `IndexMut` for arrays)
 - rust-lang#76339 (Test structural matching for all range types)
 - rust-lang#77691 (Rename/Deprecate LayoutErr in favor of LayoutError)
 - rust-lang#78364 (Update RELEASES.md for 1.48.0)
 - rust-lang#78678 (Add tests and improve rendering of cfgs on traits)
 - rust-lang#78714 (Simplify output capturing)
 - rust-lang#78769 (Remove unneeded lifetimes in array/mod.rs)
 - rust-lang#78903 (BTreeMap: test chaotic ordering & other bits & bobs)
 - rust-lang#79032 (improve type const mismatch errors)
 - rust-lang#79061 (Make all rustdoc functions and structs crate-private)
 - rust-lang#79087 (Update E0744 about control flow in `const` contexts to accurately describe when the error is triggered and why)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bac213b into rust-lang:master Nov 17, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 17, 2020
@ssomers ssomers deleted the btree_order_chaos_testing branch November 17, 2020 02:14
ssomers added a commit to ssomers/rust that referenced this pull request Nov 22, 2020
@ssomers
BTreeMap: fix minor testing mistakes in rust-lang#78903
9186c07
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 22, 2020
@m-ou-se
Rollup merge of rust-lang#79295 - ssomers:btree_fix_78903, r=Mark-Sim…
b54838f 
…ulacrum

BTreeMap: fix minor testing mistakes in rust-lang#78903

Mostly a duplicate test case
r? `@Mark-Simulacrum`
@m-ou-se m-ou-se mentioned this pull request Nov 22, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 22, 2020
@bors
Auto merge of rust-lang#79319 - m-ou-se:rollup-d9n5viq, r=m-ou-se
32da90b 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#76941 (Add f{32,64}::is_subnormal)
 - rust-lang#77697 (Split each iterator adapter and source into individual modules)
 - rust-lang#78305 (Stabilize alloc::Layout const functions)
 - rust-lang#78608 (Stabilize refcell_take)
 - rust-lang#78793 (Clean up `StructuralEq` docs)
 - rust-lang#79267 (BTreeMap: address namespace conflicts)
 - rust-lang#79293 (Add test for eval order for a =b)
 - rust-lang#79295 (BTreeMap: fix minor testing mistakes in rust-lang#78903)
 - rust-lang#79297 (BTreeMap: swap the names of NodeRef::new and Root::new_leaf)
 - rust-lang#79299 (Stabilise `then`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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.50.0
Development

Successfully merging this pull request may close these issues.
6 participants
@ssomers @bors @Mark-Simulacrum @rust-highfive @jyn514 @rustbot