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 testing: introduce symbolic constants and use height consistently #70506

Merged
merged 1 commit into from
Mar 29, 2020
Merged

BTreeMap testing: introduce symbolic constants and use height consistently #70506

merged 1 commit into from
Mar 29, 2020

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Mar 28, 2020

Doesn't change what or how much is tested, except for some exact integer types, just for convenience and because node::CAPACITY is a usize.

r? @RalfJung

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 28, 2020
@ssomers ssomers mentioned this pull request Mar 28, 2020
Merged
@ssomers ssomers force-pushed the btreemap_testing_consts branch from e2266ac to e92d740 Compare March 28, 2020 22:31
@RalfJung
Copy link
Member

Thanks a lot, this helps to make these tests much less magic. :)
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 29, 2020

📌 Commit e92d740 has been approved by RalfJung

@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 Mar 29, 2020
@Centril Centril mentioned this pull request Mar 29, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2020
@bors
Auto merge of rust-lang#70525 - Centril:rollup-vj3esv3, r=Centril
8ab82b8 
Rollup of 3 pull requests

Successful merges:

 - rust-lang#68692 (impl From<[T; N]> for Vec<T>)
 - rust-lang#70101 (Add copy bound to atomic & numeric intrinsics)
 - rust-lang#70506 (BTreeMap testing: introduce symbolic constants and use height consistently)

Failed merges:

r? @ghost
@bors bors merged commit f31e563 into rust-lang:master Mar 29, 2020
@RalfJung RalfJung mentioned this pull request Mar 30, 2020
Merged
RalfJung
RalfJung reviewed Mar 30, 2020
View reviewed changes
src/liballoc/tests/btree/map.rs
@@ -519,7 +528,7 @@ fn test_range_1000() {
#[cfg(not(miri))] // Miri is too slow
let size = 1000;
#[cfg(miri)]
let size = 144; // to obtain height 3 tree (having edges to both kinds of nodes)
let size = MIN_INSERTS_HEIGHT_2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this unfortunately broke the build in Miri as the type is now usize instead of u32... see #70559

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also forgot to check Linux builds and debug assertions lately. So I'll just push here, I guess.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WDYM "push here"? This PR landed already...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

miri-test-libstd also enables debug assertions, so that part is covered (also I believe some CI runners have debug assertions enabled).

Copy link
Contributor Author

@ssomers ssomers Mar 30, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I misinterpreted. Thanks for fixing.

I'm pretty sure the ordinary PR checks a few months ago, when there were 4 of them, did not include debug assertions, so I did those myself. And --no-doc to test benchmarks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah the PR runner probably has debug assertions disabled, but some others at least used to have them enabled.

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 30, 2020
@Dylan-DPC
Rollup merge of rust-lang#70559 - RalfJung:btree-test-miri, r=Mark-Si…
298a89b 
…mulacrum

fix BTreeMap test compilation with Miri

This got broken by rust-lang#70506
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

Assignees

@RalfJung RalfJung

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ssomers @RalfJung @bors @rust-highfive