Skip to content

Rollup of 5 pull requests - #66446

Closed
Centril wants to merge 30 commits into
rust-lang:masterfrom
Centril:rollup-87qq5yl
Closed

Rollup of 5 pull requests#66446
Centril wants to merge 30 commits into
rust-lang:masterfrom
Centril:rollup-87qq5yl

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Centriland others added 30 commits November 14, 2019 13:40
Push `ast::{ItemKind, ImplItemKind}::OpaqueTy` hack down into lowering
We currently have a hack in the form of `ast::{ItemKind, ImplItemKind}::OpaqueTy` which is constructed literally when you write `type Alias = impl Trait;` but not e.g. `type Alias = Vec<impl Trait>;`. Per rust-lang/rfcs#2515, this needs to change to allow `impl Trait` in nested positions. This PR achieves this change for the syntactic aspect but not the semantic one, which will require changes in lowering and def collection. In the interim, `TyKind::opaque_top_hack` is introduced to avoid knock-on changes in lowering, collection, and resolve. These hacks can then be removed and fixed one by one until the desired semantics are supported.
r? @varkor
…excrichton
Add --force-run-in-process unstable option to libtest
When running tests with `-Zpanic_abort_tests`, it's sometimes desirable to fall back to the old behavior of only running tests in-process. This comes in handy if the system process launcher is unavailable, or the test code somehow expects all tests to be run in the same process.
For example, in Fuchsia we have unit tests that actually test the process launcher itself, in which case we can't use the process launcher to run the tests :).
r? @alexcrichton
cc @cramertj,@petrhosek
Correct `const_in_array_repeat_expressions` feature name
Fixesrust-lang#66433
r? @estebank
… r=Mark-Simulacrum
Port erased cleanup
Just realised that the changes I made in rust-lang#65965 were removed after the move of all error codes so here it is. I made them into separate commits to make the history look better this time.
r? @Mark-Simulacrum
@CentrilCentril added the rollup A PR which is a rollup label Nov 15, 2019
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ rollup=never p=5

@bors

bors commented Nov 15, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3294f41 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 15, 2019
@bors

bors commented Nov 15, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3294f41 with merge b7258fcc9770ecb93582f7902a21232e2f3c1e7a...

@tmandry

Copy link
Copy Markdown
Member

@bors r- retry
This will fail because of #66415 (comment)

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 15, 2019
@CentrilCentril closed this Nov 15, 2019
@Centril
Centril deleted the rollup-87qq5yl branch November 15, 2019 13:46
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-6.0 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-11-15T13:12:52.8869989Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-15T13:12:52.9047306Z ##[command]git config gc.auto 0
2019-11-15T13:12:52.9115555Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-15T13:12:52.9178323Z ##[command]git config --get-all http.proxy
2019-11-15T13:12:52.9319814Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66446/merge:refs/remotes/pull/66446/merge
---
2019-11-15T14:09:41.6452586Z .................................................................................................... 1500/9244
2019-11-15T14:09:47.4279319Z .................................................................................................... 1600/9244
2019-11-15T14:09:56.0760121Z .................................................................................................... 1700/9244
2019-11-15T14:10:04.3941485Z .....i.............................................................................................. 1800/9244
2019-11-15T14:10:10.6931112Z .........................................................................................iiiii...... 1900/9244
2019-11-15T14:10:31.3591557Z .................................................................................................... 2100/9244
2019-11-15T14:10:33.7090518Z .................................................................................................... 2200/9244
2019-11-15T14:10:36.1809187Z .................................................................................................... 2300/9244
2019-11-15T14:10:42.2837195Z .................................................................................................... 2400/9244
---
2019-11-15T14:13:31.3301407Z ........................................................................................i........... 4700/9244
2019-11-15T14:13:37.8954584Z ....i............................................................................................... 4800/9244
2019-11-15T14:13:46.9476444Z .................................................................................................... 4900/9244
2019-11-15T14:13:52.0804302Z .................................................................................................... 5000/9244
2019-11-15T14:14:02.3888475Z ............................................................................................ii.ii... 5100/9244
2019-11-15T14:14:10.8202244Z ............................i....................................................................... 5300/9244
2019-11-15T14:14:19.0267958Z .................................................................................................... 5400/9244
2019-11-15T14:14:27.2195429Z ..........................................................................i......................... 5500/9244
2019-11-15T14:14:34.6094066Z .................................................................................................... 5600/9244
2019-11-15T14:14:34.6094066Z .................................................................................................... 5600/9244
2019-11-15T14:14:41.1729436Z .................................................................................................... 5700/9244
2019-11-15T14:14:50.7722639Z ............................................................ii...i..ii...........i.................. 5800/9244
2019-11-15T14:15:12.2594047Z .................................................................................................... 6000/9244
2019-11-15T14:15:20.3282295Z .................................................................................................... 6100/9244
2019-11-15T14:15:20.3282295Z .................................................................................................... 6100/9244
2019-11-15T14:15:25.7892994Z ...............................................................................i..ii................ 6200/9244
2019-11-15T14:15:53.3029817Z .................................................................................................... 6400/9244
2019-11-15T14:15:56.6312614Z ...............................................i.................................................... 6500/9244
2019-11-15T14:15:58.8014998Z .................................................................................................... 6600/9244
2019-11-15T14:16:01.1571536Z ..................................i................................................................. 6700/9244
---
2019-11-15T14:21:02.8273605Z finished in 5.504
2019-11-15T14:21:02.8454979Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:21:03.0267648Z 2019-11-15T14:21:03.0268867Z running 156 tests
2019-11-15T14:21:05.7842386Z iiii....iii......iii..iiii...i.............................i..i..................i....i...........ii 100/156
2019-11-15T14:21:07.6455484Z .i.i..iiii..............i.........iii.i.........ii......
2019-11-15T14:21:07.6456851Z 2019-11-15T14:21:07.6462927Z finished in 4.800
2019-11-15T14:21:07.6645637Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:21:07.8266932Z ---
2019-11-15T14:21:09.6694284Z finished in 2.005
2019-11-15T14:21:09.6875470Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:21:09.8445689Z 2019-11-15T14:21:09.8447049Z running 9 tests
2019-11-15T14:21:09.8447868Z iiiiiiiii
2019-11-15T14:21:09.8448283Z 2019-11-15T14:21:09.8448326Z finished in 0.157
2019-11-15T14:21:09.8629503Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:21:10.0391423Z ---
2019-11-15T14:21:28.2689341Z finished in 18.406
2019-11-15T14:21:28.2894556Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:21:28.4674059Z 2019-11-15T14:21:28.4674314Z running 123 tests
2019-11-15T14:21:51.4266564Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-11-15T14:21:55.9513986Z i.i.i......iii.i.....ii
2019-11-15T14:21:55.9515665Z 2019-11-15T14:21:55.9518377Z finished in 27.662
2019-11-15T14:21:55.9527454Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:21:55.9528481Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-11-15T14:33:29.8463365Z 2019-11-15T14:33:29.8464248Z Doc-tests core
2019-11-15T14:33:34.6069643Z 2019-11-15T14:33:34.6083326Z running 2420 tests
2019-11-15T14:33:44.9248096Z ......iiiii......................................................................................... 100/2420
2019-11-15T14:33:54.8081454Z .................................................................................ii................. 200/2420
2019-11-15T14:34:18.3605065Z ...i................................................................................................ 400/2420
2019-11-15T14:34:18.3605065Z ...i................................................................................................ 400/2420
2019-11-15T14:34:28.0734174Z ...................................................i..i.................iiii........................ 500/2420
2019-11-15T14:34:46.3505896Z .................................................................................................... 700/2420
2019-11-15T14:34:55.9995338Z .................................................................................................... 800/2420
2019-11-15T14:35:05.5252118Z .................................................................................................... 900/2420
2019-11-15T14:35:15.0095912Z .................................................................................................... 1000/2420
---
2019-11-15T14:38:58.3472081Z .................................................................................................... 100/763
2019-11-15T14:38:58.7374503Z .................................................................................................... 200/763
2019-11-15T14:38:58.9189553Z .....................................................thread '<unnamed>' panicked at 'explicit panic', src/libstd/io/buffered.rs:1406:17
2019-11-15T14:38:58.9310505Z ............................................... 300/763
2019-11-15T14:38:58.9328371Z ...thread '.<unnamed>.' panicked at 'explicit panic', src/libstd/io/stdio.rs:854:13
2019-11-15T14:39:01.0520100Z .................................................................................................... 500/763
2019-11-15T14:39:01.0736807Z ....................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1187:5
2019-11-15T14:39:01.0758401Z ....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: "SendError(..)"', src/libcore/result.rs:1187:5
2019-11-15T14:39:01.0761064Z thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1187:5
---
2019-11-15T14:39:12.5535127Z 2019-11-15T14:39:12.5537859Z running 999 tests
2019-11-15T14:39:32.9641104Z i................................................................................................... 100/999
2019-11-15T14:39:43.7788573Z .................................................................................................... 200/999
2019-11-15T14:39:51.4276213Z ..................iii......i......i...i......i...................................................... 300/999
2019-11-15T14:39:56.5484906Z .................................................................................................... 400/999
2019-11-15T14:40:03.6911481Z ..........................................i..i.................................ii................... 500/999
2019-11-15T14:40:17.2194086Z .................................................................................................... 700/999
2019-11-15T14:40:17.2194086Z .................................................................................................... 700/999
2019-11-15T14:40:24.3625273Z .........................iiii....................................................................... 800/999
2019-11-15T14:40:39.2386790Z .................................................................................................... 900/999
2019-11-15T14:40:46.5355650Z ...............................................iiii................................................
2019-11-15T14:40:46.5356133Z 2019-11-15T14:40:46.5415628Z finished in 185.441
2019-11-15T14:40:46.5431880Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:40:46.7542585Z Compiling term v0.0.0 (/checkout/src/libterm)
---
2019-11-15T14:40:48.6791119Z 2019-11-15T14:40:48.6853034Z finished in 2.142
2019-11-15T14:40:48.6867792Z Testing test stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-11-15T14:40:48.9012490Z Compiling test v0.0.0 (/checkout/src/libtest)
2019-11-15T14:40:49.4899746Z error[E0063]: missing field `force_run_in_process` in initializer of `cli::TestOpts`
2019-11-15T14:40:49.4900468Z |
2019-11-15T14:40:49.4900769Z 23 | TestOpts {
2019-11-15T14:40:49.4901132Z | ^^^^^^^^ missing `force_run_in_process`
2019-11-15T14:40:49.4901223Z ---
2019-11-15T14:40:49.5696645Z local time: Fri Nov 15 14:40:49 UTC 2019
2019-11-15T14:40:49.7180767Z network time: Fri, 15 Nov 2019 14:40:49 GMT
2019-11-15T14:40:49.7180846Z == end clock drift check ==
2019-11-15T14:40:50.3507979Z 2019-11-15T14:40:50.3663217Z ##[error]Bash exited with code '1'.
2019-11-15T14:40:50.3697117Z ##[section]Starting: Checkout
2019-11-15T14:40:50.3699028Z ==============================================================================
2019-11-15T14:40:50.3699099Z Task : Get sources
2019-11-15T14:40:50.3699143Z 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)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

6 participants

@Centril@bors@tmandry@rust-highfive@JohnTitor@GuillaumeGomez