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

Rollup of 7 pull requests #67575

Merged
merged 28 commits into from
Dec 24, 2019
Merged

Rollup of 7 pull requests #67575

merged 28 commits into from
Dec 24, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 24, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 28 commits December 22, 2019 20:39
and some uses of it will be illegal forever
(e.g. mutable or interior mutable statics)
Co-Authored-By: Mazdak Farrokhzad <[email protected]>
Use slice patterns to avoid having to skip bounds checking
…t, r=RalfJung

Ensure that evaluating or validating a constant never reads from a static

r? @RalfJung

as per rust-lang#66302 (comment)

This does not yet address the fact that evaluation of a constant can read from a static (under unleash-miri)
Add regression tests for fixed ICEs

Closes rust-lang#61747 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closes rust-lang#66205 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closes rust-lang#66270 (fixed by rust-lang#66246)
Closes rust-lang#67424 (fixed by rust-lang#67160)

Also picking a minor nit up from rust-lang#67071 with 101dd7b

r? @Centril
Add long error code explanation message for E0627

Part of rust-lang#61137.

r? @GuillaumeGomez
…schievink

remove `description` from `Error` impls in docs

Since `description` is soft-deprecated, there's no need to show it implemented in these examples.
…oli-obk

Clean up unsafety in char::encode_utf8

This originally started as an attempt to allow LLVM to optimize through
encode_utf8 to detect the try_encode_utf8 case (rust-lang#52579, rust-lang#52580), but due to a
typo my conclusion that my optimizations were successful was incorrect.

Furthermore, as far as I can tell, this optimization is probably just not
possible with LLVM today.  This [code](https://rust.godbolt.org/z/JggRj4)
compiles down to a long series of compares, notably, two identical series of
compares. That essentially means that LLVM is today unable to see that these two
ifs are identical and as such can be merged and then realize that no value of
the if condition can result in a call to `please_delete`. As such, for now, we
do not attempt to specifically optimize for that case.
…rk-Simulacrum

Use the chocolatey CDN directly to avoid the flaky API
@Centril Centril added the rollup A PR which is a rollup label Dec 24, 2019
@Centril
Copy link
Contributor Author

Centril commented Dec 24, 2019

@bors r+ p=200 rollup=never

@bors
Copy link
Contributor

bors commented Dec 24, 2019

📌 Commit a76d67f has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 24, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 24, 2019
@bors
Copy link
Contributor

bors commented Dec 24, 2019

⌛ Testing commit a76d67f with merge 6253754...

bors added a commit that referenced this pull request Dec 24, 2019
Rollup of 7 pull requests

Successful merges:

 - #67337 (Ensure that evaluating or validating a constant never reads from a static)
 - #67543 (Add regression tests for fixed ICEs)
 - #67547 (Cleanup err codes)
 - #67551 (Add long error code explanation message for E0627)
 - #67561 (remove `description` from `Error` impls in docs)
 - #67569 (Clean up unsafety in char::encode_utf8)
 - #67572 (Use the chocolatey CDN directly to avoid the flaky API)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 24, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 6253754 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 24, 2019
@bors bors merged commit a76d67f into rust-lang:master Dec 24, 2019
@Centril Centril deleted the rollup-feikoir branch December 24, 2019 14:08
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. rollup A PR which is a rollup 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.

10 participants