[beta] beta backports #69360

Mark-Simulacrum · 2020-02-21T21:41:15Z

This backports the following PRs:

Revert "Remove checked_add in Layout::repeat" Revert "Remove checked_add in Layout::repeat" #69241
Do not ICE when encountering yield inside async block Do not ICE when encountering yield inside async block #69175
Fix MIR typeck soundness holes Fix MIR typeck soundness holes #69145
Fix extra subslice lowering Fix extra subslice lowering #69128
Correct ICE caused by macros generating invalid spans. Correct ICE caused by macros generating invalid spans. #68611
Make conflicting_repr_hints a deny-by-default c-future-compat lint Make conflicting_repr_hints a deny-by-default c-future-compat lint #68586

This fixes a a segfault in safe code, a stable regression. Reported in \rust-lang#69225. This reverts commit a983e05. Also adds a test for the expected behaviour.

Mark-Simulacrum · 2020-02-21T21:42:06Z

@bors r+ p=1 rollup=never

bors · 2020-02-21T21:42:08Z

📌 Commit cdcf45b has been approved by Mark-Simulacrum

bors · 2020-02-22T00:07:27Z

⌛ Testing commit cdcf45b with merge 805235f30b347e4196f4e8ee189194d44f9ecec5...

rust-highfive · 2020-02-22T00:10:31Z

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.

2020-02-22T00:08:38.5807577Z ##[command]git config gc.auto 0
2020-02-22T00:08:38.6532386Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-22T00:08:38.6870363Z ##[command]git config --get-all http.proxy
2020-02-22T00:08:38.7231460Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin
2020-02-22T00:09:00.7011397Z fatal: unable to access 'https://github.com/rust-lang/rust/': Failed to connect to github.com port 443: Timed out
2020-02-22T00:09:00.7604682Z ##[warning]Git fetch failed with exit code 128, back off 8.452 seconds before retry.
2020-02-22T00:09:09.1727332Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin
2020-02-22T00:09:30.2748890Z fatal: unable to access 'https://github.com/rust-lang/rust/': Failed to connect to github.com port 443: Timed out
2020-02-22T00:09:30.3485910Z ##[warning]Git fetch failed with exit code 128, back off 5.829 seconds before retry.
2020-02-22T00:09:36.1180783Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin
2020-02-22T00:09:57.2311402Z fatal: unable to access 'https://github.com/rust-lang/rust/': Failed to connect to github.com port 443: Timed out
2020-02-22T00:09:57.2659302Z ##[error]Git fetch failed with exit code: 128
2020-02-22T00:09:57.3502704Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-02-22T00:09:57.3608280Z ==============================================================================
2020-02-22T00:09:57.3608593Z Task         : Get sources
2020-02-22T00:09:57.3608929Z 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 · 2020-02-22T00:10:46Z

💔 Test failed - checks-azure

This helps us have enough disk space for our builders to be able to complete successfully. For now, the choices are ad-hoc and 'definitely not needed'. This should never fail the build, as everything our build needs should be inside Docker.

Mark-Simulacrum · 2020-02-23T22:36:43Z

@bors r+

bors · 2020-02-23T22:36:44Z

📌 Commit a9b95b3 has been approved by Mark-Simulacrum

bors · 2020-02-23T22:41:46Z

⌛ Testing commit a9b95b3 with merge 1750a108e5a0c5b06d9a82ac8dbc1df58aaf0c6a...

rust-highfive · 2020-02-23T23:35:00Z

The job x86_64-gnu-llvm-7 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.

2020-02-23T23:33:53.0038584Z 10 
2020-02-23T23:33:53.0038756Z 
2020-02-23T23:33:53.0038910Z 
2020-02-23T23:33:53.0039172Z The actual stderr differed from the expected stderr.
2020-02-23T23:33:53.0039815Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/async-generator-issue-67158/async-generator-issue-67158.stderr
2020-02-23T23:33:53.0040443Z To update references, rerun the tests and pass the `--bless` flag
2020-02-23T23:33:53.0041028Z To only update this specific test, also pass `--test-args generator/async-generator-issue-67158.rs`
2020-02-23T23:33:53.0041567Z error: 1 errors occurred comparing output.
2020-02-23T23:33:53.0041852Z status: exit code: 1
2020-02-23T23:33:53.0041852Z status: exit code: 1
2020-02-23T23:33:53.0043673Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/generator/async-generator-issue-67158.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/async-generator-issue-67158" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/async-generator-issue-67158/auxiliary" "-A" "unused"
2020-02-23T23:33:53.0045157Z ------------------------------------------
2020-02-23T23:33:53.0045375Z 
2020-02-23T23:33:53.0045744Z ------------------------------------------
2020-02-23T23:33:53.0045990Z stderr:
2020-02-23T23:33:53.0045990Z stderr:
2020-02-23T23:33:53.0046362Z ------------------------------------------
2020-02-23T23:33:53.0046681Z error[E0727]: `async` generators are not yet supported
2020-02-23T23:33:53.0047203Z   --> /checkout/src/test/ui/generator/async-generator-issue-67158.rs:5:13
2020-02-23T23:33:53.0047517Z    |
2020-02-23T23:33:53.0047901Z LL |     async { yield print!(":C") }; //~ ERROR `async` generators are not yet supported
2020-02-23T23:33:53.0048488Z 
2020-02-23T23:33:53.0048722Z error: aborting due to previous error
2020-02-23T23:33:53.0048925Z 
2020-02-23T23:33:53.0049081Z 
---
2020-02-23T23:33:53.0062886Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:349:22
2020-02-23T23:33:53.0063602Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-02-23T23:33:53.0077307Z 
2020-02-23T23:33:53.0077532Z 
2020-02-23T23:33:53.0081011Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-02-23T23:33:53.0083043Z 
2020-02-23T23:33:53.0083126Z 
2020-02-23T23:33:53.0085255Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-02-23T23:33:53.0085680Z Build completed unsuccessfully in 0:43:01
2020-02-23T23:33:53.0085680Z Build completed unsuccessfully in 0:43:01
2020-02-23T23:33:53.0129612Z == clock drift check ==
2020-02-23T23:33:53.0146530Z   local time: Sun Feb 23 23:33:53 UTC 2020
2020-02-23T23:33:53.0499498Z   network time: Sun, 23 Feb 2020 23:33:53 GMT
2020-02-23T23:33:53.0500570Z == end clock drift check ==
2020-02-23T23:33:53.5763971Z 
2020-02-23T23:33:53.5826658Z ##[error]Bash exited with code '1'.
2020-02-23T23:33:53.5887401Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-02-23T23:33:53.5892041Z ==============================================================================
2020-02-23T23:33:53.5892409Z Task         : Get sources
2020-02-23T23:33:53.5892808Z 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 · 2020-02-23T23:35:16Z

💔 Test failed - checks-azure

Mark-Simulacrum · 2020-02-24T01:09:50Z

@bors r+

bors · 2020-02-24T01:09:51Z

📌 Commit e553243 has been approved by Mark-Simulacrum

bors · 2020-02-24T07:00:16Z

⌛ Testing commit e553243 with merge 13e0fbc...

pietroalbini · 2020-02-24T09:48:31Z

@bors treeclosed=1000

I need to make some infrastructure changes to our CI, so let's close the queue in the meantime.

bors · 2020-02-24T10:08:02Z

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 13e0fbc to beta...

shahn and others added 7 commits February 21, 2020 16:38

Revert "Remove checked_add in Layout::repeat"

123df59

This fixes a a segfault in safe code, a stable regression. Reported in \rust-lang#69225. This reverts commit a983e05. Also adds a test for the expected behaviour.

Do not ICE when encountering yield inside async block

ee392df

Check Copy lifetimes bounds when copying from a projection

e169d69

Check types of statics in MIR typeck

cff23e8

fix extra subslice lowering

38bdc5f

Correct ICE caused by macros generating invalid spans.

a07f8db

lintify conflicting_repr_hints

cdcf45b

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 21, 2020

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 Feb 22, 2020

Clean out some default-installed directories

a9b95b3

This helps us have enough disk space for our builders to be able to complete successfully. For now, the choices are ad-hoc and 'definitely not needed'. This should never fail the build, as everything our build needs should be inside Docker.

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 23, 2020

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 Feb 23, 2020

Fix stderr for test

e553243

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 24, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 24, 2020

bors merged commit 13e0fbc into rust-lang:beta Feb 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[beta] beta backports #69360

[beta] beta backports #69360

Mark-Simulacrum commented Feb 21, 2020 •

edited

Loading

Mark-Simulacrum commented Feb 21, 2020

bors commented Feb 21, 2020

bors commented Feb 22, 2020

rust-highfive commented Feb 22, 2020

bors commented Feb 22, 2020

Mark-Simulacrum commented Feb 23, 2020

bors commented Feb 23, 2020

bors commented Feb 23, 2020

rust-highfive commented Feb 23, 2020

bors commented Feb 23, 2020

Mark-Simulacrum commented Feb 24, 2020

bors commented Feb 24, 2020

bors commented Feb 24, 2020

pietroalbini commented Feb 24, 2020

bors commented Feb 24, 2020

[beta] beta backports #69360

[beta] beta backports #69360

Conversation

Mark-Simulacrum commented Feb 21, 2020 • edited Loading

Mark-Simulacrum commented Feb 21, 2020

bors commented Feb 21, 2020

bors commented Feb 22, 2020

rust-highfive commented Feb 22, 2020

bors commented Feb 22, 2020

Mark-Simulacrum commented Feb 23, 2020

bors commented Feb 23, 2020

bors commented Feb 23, 2020

rust-highfive commented Feb 23, 2020

bors commented Feb 23, 2020

Mark-Simulacrum commented Feb 24, 2020

bors commented Feb 24, 2020

bors commented Feb 24, 2020

pietroalbini commented Feb 24, 2020

bors commented Feb 24, 2020

Mark-Simulacrum commented Feb 21, 2020 •

edited

Loading