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

Revert u8to64_le changes from #68914. #69332

Merged
merged 1 commit into from
Feb 22, 2020

Conversation

nnethercote
Copy link
Contributor

SipHasher128's u8to64_le function was simplified in #68914.
Unfortunately, the new version is slower, because it introduces memcpy
calls with non-statically-known lengths.

This commit reverts the change, and adds an explanatory comment (which
is also added to libcore/hash/sip.rs). This barely affects
SipHasher128's speed because it doesn't use u8to64_le much, but it
does result in SipHasher128 once again being consistent with
libcore/hash/sip.rs.

r? @michaelwoerister

`SipHasher128`'s `u8to64_le` function was simplified in rust-lang#68914.
Unfortunately, the new version is slower, because it introduces `memcpy`
calls with non-statically-known lengths.

This commit reverts the change, and adds an explanatory comment (which
is also added to `libcore/hash/sip.rs`). This barely affects
`SipHasher128`'s speed because it doesn't use `u8to64_le` much, but it
does result in `SipHasher128` once again being consistent with
`libcore/hash/sip.rs`.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2020
@michaelwoerister
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 21, 2020

📌 Commit 100ff5a has been approved by michaelwoerister

@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 Feb 21, 2020
@bors
Copy link
Contributor

bors commented Feb 22, 2020

⌛ Testing commit 100ff5a with merge 03d2f5c...

@bors
Copy link
Contributor

bors commented Feb 22, 2020

☀️ Test successful - checks-azure
Approved by: michaelwoerister
Pushing 03d2f5c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 22, 2020
@bors bors merged commit 03d2f5c into rust-lang:master Feb 22, 2020
@nnethercote nnethercote deleted the revert-u8to64_le-changes branch February 23, 2020 22:08
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 2, 2020
…k-Simulacrum

Toolstate: Don't block beta week on already broken tools.

This changes it so that tools are allowed to be broken entering the beta week if they are already broken.  This restores the original behavior before the changes in rust-lang#69332.

Closes rust-lang#68458
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants