Rollup of 5 pull requests #64955

Centril · 2019-10-01T12:22:06Z

Successful merges:

Add long error explanation for E0495 #64404 (Add long error explanation for E0495)
Make all alt builders produce parallel-enabled compilers #64722 (Make all alt builders produce parallel-enabled compilers)
SelfProfiler API refactoring and part one of event review #64840 (SelfProfiler API refactoring and part one of event review)
[const-prop] Handle remaining MIR Rvalue cases #64890 ([const-prop] Handle remaining MIR Rvalue cases)
syntax: cleanup param, method, and misc parsing #64910 (syntax: cleanup param, method, and misc parsing)

Failed merges:

We're not quite ready to ship parallel compilers by default, but the alt builders are not used too much (in theory), so we believe that shipping a possibly-broken compiler there is not too problematic.

…ible.

… new API.

This changes the default parallelism for parallel compilers to one, instead of the previous default, which was "num cpus". This is likely not an optimal default long-term, but it is a good default for testing whether parallel compilers are not a significant regression over a sequential compiler. Notably, this in theory makes a parallel-enabled compiler behave exactly like a sequential compiler with respect to the jobserver.

Add long error explanation for E0495 Part of rust-lang#61137.

@nikomatsakis

…xcrichton Make all alt builders produce parallel-enabled compilers We're not quite ready to ship parallel compilers by default, but the alt builders are not used too much (in theory), so we believe that shipping a possibly-broken compiler there is not too problematic. r? @nikomatsakis

@wesleywiser

…i-refactor, r=wesleywiser SelfProfiler API refactoring and part one of event review This PR refactors the `SelfProfiler` a little bit so that most profiling methods are RAII-based. The codegen backend code already had something similar, this refactoring pulls this functionality up into `SelfProfiler` itself, for general use. The second commit of this PR is a review and update of the existing events we are already recording. Names have been made more consistent. CGU names have been removed from event names. They will be added back in when function parameter recording is implemented. There is still some work to be done for adding new events, especially around trait resolution and the incremental system. r? @wesleywiser

@oli-obk

…i-obk [const-prop] Handle remaining MIR Rvalue cases r? @oli-obk

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

Centril · 2019-10-01T12:22:26Z

@bors r+ p=5 rollup=never

bors · 2019-10-01T12:22:28Z

📌 Commit 35e8755 has been approved by Centril

bors · 2019-10-01T12:22:47Z

⌛ Testing commit 35e8755 with merge 972627fc1ed463edb432c0040938fbd593597cf2...

bors · 2019-10-01T13:05:16Z

💔 Test failed - checks-azure

rust-highfive · 2019-10-01T13:05:17Z

The job dist-powerpc-linux 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-10-01T13:02:33.1829007Z note: the compiler unexpectedly panicked. this is a bug.
2019-10-01T13:02:33.1829086Z 
2019-10-01T13:02:33.1829545Z note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
2019-10-01T13:02:33.1829607Z 
2019-10-01T13:02:33.1829868Z note: rustc 1.40.0-nightly (972627fc1 2019-10-01) running on x86_64-unknown-linux-gnu
2019-10-01T13:02:33.1829917Z 
2019-10-01T13:02:33.1830381Z note: compiler flags: -Z dual-proc-macros -Z external-macro-backtrace -Z unstable-options -Z binary-dep-depinfo -Z force-unstable-if-unmarked -C opt-level=2 -C debuginfo=0 -C linker=powerpc-unknown-linux-gnu-gcc -C link-args=-Wl,-rpath,$ORIGIN/../lib -C prefer-dynamic -C debug-assertions=n --crate-type lib
2019-10-01T13:02:33.1830734Z note: some of the compiler flags provided by cargo are hidden
2019-10-01T13:02:33.1830775Z 
2019-10-01T13:02:33.1864802Z [RUSTC-TIMING] crc32fast test:false 0.146
2019-10-01T13:02:33.1870447Z error: could not compile `crc32fast`.
---
2019-10-01T13:02:33.6740298Z == clock drift check ==
2019-10-01T13:02:33.6753440Z   local time: Tue Oct  1 13:02:33 UTC 2019
2019-10-01T13:02:35.9936218Z   network time: Tue, 01 Oct 2019 13:02:35 GMT
2019-10-01T13:02:35.9937125Z == end clock drift check ==
2019-10-01T13:02:38.4291611Z ##[error]Bash exited with code '1'.
2019-10-01T13:02:38.4342085Z ##[section]Starting: Upload CPU usage statistics
2019-10-01T13:02:38.4348902Z ==============================================================================
2019-10-01T13:02:38.4348979Z Task         : Bash
2019-10-01T13:02:38.4349052Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

Mark-Simulacrum and others added 30 commits September 23, 2019 19:27

Make all alt builders produce parallel-enabled compilers

a3639c6

We're not quite ready to ship parallel compilers by default, but the alt builders are not used too much (in theory), so we believe that shipping a possibly-broken compiler there is not too problematic.

[const-prop] Handle MIR Rvalue::Repeat

d2c0d10

syntax: cleanup method parsing.

f290467

syntax: is_named_argument -> is_named_param.

378cc98

syntax refactor parse_fn_params

4fa9c3b

syntax refactor parse_self_param (1)

40dc9da

syntax refactor parse_self_param (2)

f688f8a

syntax refactor parse_self_param (3)

ac454e9

syntax refactor parse_self_param (4)

4306d00

syntax refactor parse_self_param (5)

0492302

syntax: reorder param parsing to make more sense.

347deac

syntax: cleanup parse_fn_decl.

d9d0e5d

syntax: misc cleanup

5b80ead

syntax: cleanup parse_visibility.

66bf323

syntax: extract error_on_invalid_abi.

573a8d8

syntax: fuse more code paths together.

258e86a

syntax: stylistic cleanup in item parsing.

bea404f

syntax: reduce repetition in fn parsing.

151ce96

Self-Profiling: Refactor SelfProfiler API to be RAII based where poss…

b0b073c

…ible.

Self-Profiling: Make names of existing events more consistent and use…

d942622

… new API.

[const-prop] Handle MIR Rvalue::Aggregates

85f2945

[const-prop] Handle MIR Rvalue::Discriminant

ea78010

[const-prop] Handle MIR Rvalue::Box

b3234a3

Cleanup const_prop() some

5804c3b

syntax: document some methods.

df298b4

syntax: put helpers of parse_self_param in the method.

30647d1

syntax: merge things back into parse_visibility.

49780d2

syntax: de-closure-ify check_or_expected.

e046904

syntax: reformat passing of FnHeader to parse_item_fn.

5c5dd80

GuillaumeGomez and others added 7 commits October 1, 2019 11:48

Add long error explanation for E0495

3237ded

update ui tests

be89e52

Rollup merge of rust-lang#64404 - GuillaumeGomez:err-E0495, r=cramertj

5ac7e21

Add long error explanation for E0495 Part of rust-lang#61137.

Rollup merge of rust-lang#64890 - wesleywiser:const_prop_rvalue, r=ol…

4707702

…i-obk [const-prop] Handle remaining MIR Rvalue cases r? @oli-obk

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 1, 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 Oct 1, 2019

Centril mentioned this pull request Oct 1, 2019

[const-prop] Handle remaining MIR Rvalue cases #64890

Merged

Centril closed this Oct 1, 2019

Centril deleted the rollup-unxnwj5 branch October 1, 2019 14:09

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #64955

Rollup of 5 pull requests #64955

Centril commented Oct 1, 2019

Centril commented Oct 1, 2019

bors commented Oct 1, 2019

bors commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019

Rollup of 5 pull requests #64955

Rollup of 5 pull requests #64955

Conversation

Centril commented Oct 1, 2019

Centril commented Oct 1, 2019

bors commented Oct 1, 2019

bors commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019