Rollup of 7 pull requests by Mark-Simulacrum · Pull Request #67573 · rust-lang/rust

Mark-Simulacrum · 2019-12-24T01:56:12Z

Successful merges:

Various const eval and pattern matching ICE fixes #67192 (Various const eval and pattern matching ICE fixes)
Add regression tests for fixed ICEs #67543 (Add regression tests for fixed ICEs)
Cleanup err codes #67547 (Cleanup err codes)
Add long error code explanation message for E0627 #67551 (Add long error code explanation message for E0627)
remove description from Error impls in docs #67561 (remove description from Error impls in docs)
Clean up unsafety in char::encode_utf8 #67569 (Clean up unsafety in char::encode_utf8)
Use the chocolatey CDN directly to avoid the flaky API #67572 (Use the chocolatey CDN directly to avoid the flaky API)

Failed merges:

Ensure that evaluating or validating a constant never reads from a static #67337 (Ensure that evaluating or validating a constant never reads from a static)

r? @ghost

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

…n matching

…ting new ones

…ands

…selves

Use slice patterns to avoid having to skip bounds checking

@RalfJung

…varkor Various const eval and pattern matching ICE fixes r? @RalfJung cc @spastorino This PR does not change existing behaviour anymore and just fixes a bunch of ICEs reachable from user code (sometimes even on stable via obscure union transmutes).

@Centril

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

@Dylan-DPC

…=Dylan-DPC Cleanup err codes r? @Dylan-DPC

@GuillaumeGomez

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

Mark-Simulacrum · 2019-12-24T01:56:28Z

@bors p=100 r+

bors · 2019-12-24T01:56:30Z

📌 Commit 37f97de has been approved by Mark-Simulacrum

bors · 2019-12-24T01:56:42Z

⌛ Testing commit 37f97de with merge bbb1cae8a834e16cdd272cada43cbbca32d9a22b...

aidanhs · 2019-12-24T02:00:07Z

🚀

rust-highfive · 2019-12-24T02:56:32Z

The job i686-apple of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-24T02:55:34.8246970Z 
2019-12-24T02:55:34.8247650Z ---- [ui] ui/consts/transmute-size-mismatch-before-typeck.rs stdout ----
2019-12-24T02:55:34.8247750Z diff of stderr:
2019-12-24T02:55:34.8247810Z 
2019-12-24T02:55:34.8247880Z 20 LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) };
2019-12-24T02:55:34.8248040Z 22    |
2019-12-24T02:55:34.8248040Z 22    |
2019-12-24T02:55:34.8248620Z -    = note: source type: `usize` (64 bits)
2019-12-24T02:55:34.8249180Z -    = note: target type: `&'static [u8]` (128 bits)
2019-12-24T02:55:34.8249290Z +    = note: source type: `usize` (32 bits)
2019-12-24T02:55:34.8249850Z +    = note: target type: `&'static [u8]` (64 bits)
2019-12-24T02:55:34.8250010Z 26 error: aborting due to 3 previous errors
2019-12-24T02:55:34.8250070Z 27 
2019-12-24T02:55:34.8250390Z 
2019-12-24T02:55:34.8250450Z 
2019-12-24T02:55:34.8250450Z 
2019-12-24T02:55:34.8250520Z The actual stderr differed from the expected stderr.
2019-12-24T02:55:34.8251340Z Actual stderr saved to /Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/test/ui/consts/transmute-size-mismatch-before-typeck/transmute-size-mismatch-before-typeck.stderr
2019-12-24T02:55:34.8251960Z To update references, rerun the tests and pass the `--bless` flag
2019-12-24T02:55:34.8252610Z To only update this specific test, also pass `--test-args consts/transmute-size-mismatch-before-typeck.rs`
2019-12-24T02:55:34.8253010Z error: 1 errors occurred comparing output.
2019-12-24T02:55:34.8253090Z status: exit code: 1
2019-12-24T02:55:34.8253090Z status: exit code: 1
2019-12-24T02:55:34.8254520Z command: "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.163.1/work/1/s/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs" "-Zthreads=1" "--target=i686-apple-darwin" "--error-format" "json" "-Zui-testing" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/test/ui/consts/transmute-size-mismatch-before-typeck" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "-L" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/test/ui/consts/transmute-size-mismatch-before-typeck/auxiliary" "-A" "unused"
2019-12-24T02:55:34.8255450Z ------------------------------------------
2019-12-24T02:55:34.8255520Z 
2019-12-24T02:55:34.8256060Z ------------------------------------------
2019-12-24T02:55:34.8256150Z stderr:
2019-12-24T02:55:34.8256150Z stderr:
2019-12-24T02:55:34.8256680Z ------------------------------------------
2019-12-24T02:55:34.8256770Z error: any use of this value will cause an error
2019-12-24T02:55:34.8257390Z   --> /Users/runner/runners/2.163.1/work/1/s/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs:10:29
2019-12-24T02:55:34.8257530Z    |
2019-12-24T02:55:34.8257600Z LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) };
2019-12-24T02:55:34.8258280Z    |                             |
2019-12-24T02:55:34.8258280Z    |                             |
2019-12-24T02:55:34.8258370Z    |                             tried to transmute from usize to &[u8], but their sizes differed
2019-12-24T02:55:34.8258530Z    = note: `#[deny(const_err)]` on by default
2019-12-24T02:55:34.8258590Z 
2019-12-24T02:55:34.8258660Z error: could not evaluate constant pattern
2019-12-24T02:55:34.8259270Z   --> /Users/runner/runners/2.163.1/work/1/s/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs:5:9
2019-12-24T02:55:34.8259270Z   --> /Users/runner/runners/2.163.1/work/1/s/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs:5:9
2019-12-24T02:55:34.8259400Z    |
2019-12-24T02:55:34.8259460Z LL |         ZST => {}
2019-12-24T02:55:34.8259540Z    |         ^^^
2019-12-24T02:55:34.8259580Z 
2019-12-24T02:55:34.8260190Z error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
2019-12-24T02:55:34.8260820Z   --> /Users/runner/runners/2.163.1/work/1/s/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs:10:29
2019-12-24T02:55:34.8260950Z    |
2019-12-24T02:55:34.8261010Z LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) };
2019-12-24T02:55:34.8261180Z    |
2019-12-24T02:55:34.8261180Z    |
2019-12-24T02:55:34.8261260Z    = note: source type: `usize` (32 bits)
2019-12-24T02:55:34.8261830Z    = note: target type: `&'static [u8]` (64 bits)
2019-12-24T02:55:34.8261960Z error: aborting due to 3 previous errors
2019-12-24T02:55:34.8262020Z 
2019-12-24T02:55:34.8262580Z For more information about this error, try `rustc --explain E0512`.
2019-12-24T02:55:34.8262660Z 
---
2019-12-24T02:55:34.8340190Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:385:22
2019-12-24T02:55:34.8340420Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-24T02:55:34.8359320Z 
2019-12-24T02:55:34.8360240Z 
2019-12-24T02:55:34.8363620Z command did not execute successfully: "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage0-tools-bin/compiletest" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage0-tools-bin/compiletest" "--compile-lib-path" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/lib" "--run-lib-path" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib" "--rustc-path" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "--src-base" "/Users/runner/runners/2.163.1/work/1/s/src/test/ui" "--build-base" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/test/ui" "--stage-id" "stage2-i686-apple-darwin" "--mode" "ui" "--target" "i686-apple-darwin" "--host" "i686-apple-darwin" "--llvm-filecheck" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/llvm/build/bin/FileCheck" "--nodejs" "/usr/local/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "--docck-python" "/usr/local/bin/python2.7" "--lldb-python" "/usr/bin/python" "--lldb-version" "lldb-902.0.79.2\n  Swift-4.1\n" "--lldb-python-dir" "/Applications/Xcode_9.3.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" "--llvm-version" "9.0.0-rust-1.42.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-12-24T02:55:34.8365170Z 
2019-12-24T02:55:34.8365640Z 
2019-12-24T02:55:34.8372770Z failed to run: /Users/runner/runners/2.163.1/work/1/s/build/bootstrap/debug/bootstrap test
2019-12-24T02:55:34.8373280Z Build completed unsuccessfully in 0:52:08
2019-12-24T02:55:34.8373280Z Build completed unsuccessfully in 0:52:08
2019-12-24T02:55:34.8441260Z == clock drift check ==
2019-12-24T02:55:34.8503400Z   local time: Tue Dec 24 02:55:34 UTC 2019
2019-12-24T02:55:34.9339680Z   network time: Tue, 24 Dec 2019 02:55:34 GMT
2019-12-24T02:55:34.9341640Z == end clock drift check ==
2019-12-24T02:55:34.9382710Z 
2019-12-24T02:55:34.9491880Z ##[error]Bash exited with code '1'.
2019-12-24T02:55:34.9537010Z ##[section]Starting: Checkout
2019-12-24T02:55:34.9539700Z ==============================================================================
2019-12-24T02:55:34.9539810Z Task         : Get sources
2019-12-24T02:55:34.9539890Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-12-24T02:56:50Z

💔 Test failed - checks-azure

GuillaumeGomez and others added 30 commits December 22, 2019 20:39

Clean up E0124 explanation

4ee18c9

Clean up E0128 explanation

1474d2a

Use is_none instead of if let

101dd7b

Add test for issue-61747

7c485cc

Add test for issue-66205

96253c2

Add test for issue-66270

6ec3a63

Update E0124.md

256eec4

Add long error code explanation message for E0627

1485c16

Yield is an expression form, not a statement.

587d03b

remove description from Error impls in docs

24f3dcf

Add test for issue-67424

1f2fa93

Apply suggestion from Centril

d918319

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Don't ICE on the use of integer addresses for ZST constants in patter…

2536c75

…n matching

Retire to_ptr which should already have no users but still kept get…

cc5cc67

…ting new ones

Simplify force_allocation_maybe_sized

8be7c54

Comment on a few odd things that we should look at

53ca738

Prevent an ICE on invalid transmutes

6976435

Interning even happens when validation of a constant fails

68ecc21

Immediately evaluate and validate constants when we want them as oper…

c4f9215

…ands

Add regression test for ZST statics being allowed to "read" from them…

7ef8cf4

…selves

Explain ParamEnv::reveal_all usage

58eec17

Comments should start capitalized and end in a period

51937ef

Explain what we are doing with parameter environments for statics

5b278bc

Explain the currently necessary existance of TransmuteSizeDiff

efbbc69

Remove unintended noisy log statement

405dbc6

Typo

eabe066

Explain why const_eval is ok here

af8ca7a

Early abort instead of building up zero sized values

4c40bb7

Add a const_eval helper to InterpCx

09dd13c

Documentation nit

79960b4

oli-obk and others added 12 commits December 23, 2019 17:44

Reintroduce the recursion comment

e9dc860

Use the targetted const eval functions

aaf7015

Fix rebase fallout

65bb805

Use the chocolatey CDN directly to avoid the flaky API

cefeb66

Minimize unsafety in encode_utf8

df4d490

Use slice patterns to avoid having to skip bounds checking

Rollup merge of rust-lang#67547 - GuillaumeGomez:cleanup-err-codes, r…

93116b2

…=Dylan-DPC Cleanup err codes r? @Dylan-DPC

Rollup merge of rust-lang#67551 - ldm0:E0627, r=Dylan-DPC

8a1015f

Add long error code explanation message for E0627 Part of rust-lang#61137. r? @GuillaumeGomez

Rollup merge of rust-lang#67561 - euclio:remove-description, r=jonas-…

b8b9a0f

…schievink remove `description` from `Error` impls in docs Since `description` is soft-deprecated, there's no need to show it implemented in these examples.

Rollup merge of rust-lang#67572 - aidanhs:aphs-choco-direct-cdn, r=Ma…

37f97de

…rk-Simulacrum Use the chocolatey CDN directly to avoid the flaky API

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 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 24, 2019

Centril mentioned this pull request Dec 24, 2019

Various const eval and pattern matching ICE fixes #67192

Merged

Centril closed this Dec 24, 2019

JohnTitor added the rollup A PR which is a rollup label Dec 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#67573

Rollup of 7 pull requests#67573
Mark-Simulacrum wants to merge 42 commits intorust-lang:masterfrom
Mark-Simulacrum:rollup-inxxvcx

Mark-Simulacrum commented Dec 24, 2019

Uh oh!

Mark-Simulacrum commented Dec 24, 2019

Uh oh!

bors commented Dec 24, 2019

Uh oh!

bors commented Dec 24, 2019

Uh oh!

aidanhs commented Dec 24, 2019

Uh oh!

rust-highfive commented Dec 24, 2019

Uh oh!

bors commented Dec 24, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Conversation

Mark-Simulacrum commented Dec 24, 2019

Uh oh!

Mark-Simulacrum commented Dec 24, 2019

Uh oh!

bors commented Dec 24, 2019

Uh oh!

bors commented Dec 24, 2019

Uh oh!

aidanhs commented Dec 24, 2019

Uh oh!

rust-highfive commented Dec 24, 2019

Uh oh!

bors commented Dec 24, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants