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

BTreeMap: keep an eye out on the size of the main components #77233

Merged
merged 1 commit into from
Sep 30, 2020

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Sep 26, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 26, 2020

#[test]
fn test_sizes() {
#[cfg(all(any(target_os = "windows", target_os = "unix"), target_pointer_width = "32"))]
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum Sep 26, 2020

Choose a reason for hiding this comment

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

We should be able to get away with just #[cfg(target_arch = "x86_64)] and a single pair of asserts, I think -- that's what we do in rustc and it works well.

Copy link
Contributor Author

@ssomers ssomers Sep 26, 2020

Choose a reason for hiding this comment

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

Yeah, that seems wiser. I actually wondered what the effect is of the two u16 fields in LeafNode that are combined - if it helps to give them each 32 bits on 64 bit platforms. But testing that doesn't have to remain in there.

@jyn514 jyn514 added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Sep 26, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 28, 2020

📌 Commit 3e485d7 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 Sep 28, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 30, 2020
…Simulacrum

BTreeMap: keep an eye out on the size of the main components

r? @Mark-Simulacrum
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 30, 2020
…as-schievink

Rollup of 12 pull requests

Successful merges:

 - rust-lang#77037 (more tiny clippy cleanups)
 - rust-lang#77233 (BTreeMap: keep an eye out on the size of the main components)
 - rust-lang#77280 (Ensure that all LLVM components requested by tests are available on CI)
 - rust-lang#77284 (library: Forward compiler-builtins "mem" feature)
 - rust-lang#77296 (liveness: Use Option::None to represent absent live nodes)
 - rust-lang#77322 (Add unstable book docs for `-Zunsound-mir-opts`)
 - rust-lang#77328 (Use `rtassert!` instead of `assert!` from the child process after fork() in std::sys::unix::process::Command::spawn())
 - rust-lang#77331 (Add test for async/await combined with const-generics.)
 - rust-lang#77338 (Fix typo in alloc vec comment)
 - rust-lang#77340 (Alloc vec use imported path)
 - rust-lang#77345 (Add test for issue rust-lang#74761)
 - rust-lang#77348 (Update books)

Failed merges:

r? `@ghost`
@bors bors merged commit 7ad03dd into rust-lang:master Sep 30, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 30, 2020
@ssomers ssomers deleted the btree_size_matters branch October 1, 2020 09:12
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.

6 participants