Another rollup #2 by Manishearth · Pull Request #48659 · rust-lang/rust

Manishearth · 2018-03-02T09:00:57Z

No description provided.

Since compiling the bootstrap command doesn't require any submodules, we can skip updating submodules when a --help command is passed in. On my machine, this saves 1 minute if the submodules are already downloaded, and 10 minutes if run on a clean repo. This commit also adds a message before compiling/downloading anything when a --help command is passed in, to tell the user WHY --help takes so long to complete. It also points the user to the bootstrap README.md for faster help. Finally, this fixes one warning message that still referenced using make instead of x.py, even though x.py is now the standard way of building rust.

When finding: ```rust match &Some(3) { &None => 1 &Some(2) => { 3 } _ => 2 } ``` provide the following diagnostic: ``` error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>` --> $DIR/missing-comma-in-match.rs:15:18 | X | &None => 1 | -- - help: missing comma | | | while parsing the match arm starting here X | &Some(2) => { 3 } | ^^ expected one of `,`, `.`, `?`, `}`, or an operator here ```

When unnecessarily using a fat arrow after an if condition, suggest the removal of it. When finding an if statement with no block, point at the `if` keyword to provide more context.

The build might otherwise break due to mixing MinGW object files from rust-std and the local MinGW which might be newer/older than the version used to build rust-std. Fixes rust-lang#48272

Currently rustc isn't always the best at producing deterministic builds of a crate when the source directory of a crate is changed. This is happening due to what appears two different sources: * First the `-L` paths passed to rustc are hashed into the crate hash. These paths through Cargo are typically absolute paths that can vary if the build directory changes. * Next the paths passed to `--extern` are also hashed which like `-L` can change if the build directory changes. This commit fixes these two sources of nondeterminism by ensuring that avoiding tracking the hashes of these arguments on the command line. For `-L` paths they're either related to loading crates (whose hashes are tracked elsewhere) or native librarise used in the linking phase (which isn't incremental). The `--extern` paths are similar in that they're related to crate resolution which is already tracked independently of the command line arguments. Closes rust-lang#48019

It was an existing solution to tell the user why a --help command takes a long time to process. However, it would only print if the stage0 rust compiler needed to be downloaded, it came after update_submodules (which took a long time), and it was immediately followed by download messages and loading bars, meaning users could easily gloss over the message. This commit also moves the help message out of main(), and instead puts it at the top of bootstrap(). main() is intended to be minimal, only handling error messages.

@nrc

…rochenkov Fixes rust-lang#47311. r? @nrc

Manishearth · 2018-03-02T09:01:51Z

@bors r+ p=10

let this run overnight

I am not supervising this, feel free to fix or close if it fails. This one contains riskier PRs which I avoided taking in previous rollups.

bors · 2018-03-02T09:01:52Z

📌 Commit ac275ee has been approved by Manishearth

kennytm · 2018-03-02T09:29:00Z

@bors r-

CI failed. Caused by #48527.

[00:05:51]    Compiling rustc_errors v0.0.0 (file:///checkout/src/librustc_errors)
[00:06:11] error[E0599]: no method named `parse_pat_tuple_elements` found for type `&mut parse::parser::Parser<'a>` in the current scope
[00:06:11]     --> libsyntax/parse/parser.rs:3783:40
[00:06:11]      |
[00:06:11] 3783 |             if let Err(mut err) = self.parse_pat_tuple_elements(false) {
[00:06:11]      |                                        ^^^^^^^^^^^^^^^^^^^^^^^^
[00:06:11]      |
[00:06:11]      = help: did you mean `parse_pat_vec_elements`?
[00:06:11] 
[00:06:13] error: aborting due to previous error
[00:06:13] 
[00:06:13] error: Could not compile `syntax`.

Manishearth · 2018-03-02T09:36:49Z

@bors r+

PR removed

bors · 2018-03-02T09:36:50Z

📌 Commit ac275ee has been approved by Manishearth

Manishearth · 2018-03-02T09:39:39Z

@bors r+

bors · 2018-03-02T09:39:40Z

📌 Commit 2f37740 has been approved by Manishearth

bors · 2018-03-02T09:40:13Z

⌛ Testing commit 2f377409bbd5c54a34f3b5c2700426131144b8d3 with merge ef3669827e83ab5b2bbb88e9f05e6631d216fe53...

bors · 2018-03-02T10:10:29Z

💔 Test failed - status-travis

kennytm · 2018-03-02T14:17:54Z

@bors r-

Caused by #48513 (comment).

This commit imports the `stdsimd` crate into the standard library, creating an `arch` and `simd` module inside of both libcore and libstd. Both of these modules are **unstable** and will continue to be so until RFC 2335 is stabilized. As a brief recap, the modules are organized as so: * `arch` contains all current architectures with intrinsics, for example `std::arch::x86`, `std::arch::x86_64`, `std::arch::arm`, etc. These modules contain all of the intrinsics defined for the platform, like `_mm_set1_epi8`. * In the standard library, the `arch` module also exports a `is_target_feature_detected` macro which performs runtime detection to determine whether a target feature is available at runtime. * The `simd` module contains experimental versions of strongly-typed lane-aware SIMD primitives, to be fully fleshed out in a future RFC. The main purpose of this commit is to start pulling in all these intrinsics and such into the standard library on nightly and allow testing and such. This'll help allow users to easily kick the tires and see if intrinsics work as well as allow us to test out all the infrastructure for moving the intrinsics into the standard library.

@nrc

…oad, r=alexcrichton Fixes rust-lang#47311. r? @nrc

@nrc

Fixes rust-lang#47311. r? @nrc

@nrc

… r=petrochenkov Fixes rust-lang#47311. r? @nrc

@nrc

Fixes rust-lang#47311. r? @nrc

@nrc

Fixes rust-lang#47311. r? @nrc

Manishearth · 2018-03-02T15:51:18Z

@bors r+

bors · 2018-03-02T15:51:19Z

📌 Commit 2f37740 has been approved by Manishearth

@nrc

…haelwoerister Fixes rust-lang#47311. r? @nrc

Manishearth · 2018-03-02T17:54:06Z

@bors r+ p=10

bors · 2018-03-02T17:54:07Z

📌 Commit bc90898 has been approved by Manishearth

Manishearth · 2018-03-02T18:19:15Z

bors is confused wrt mergeability

sanxiyn and others added 13 commits February 23, 2018 21:48

Disable NEON on musl ARMv7

8e4ad29

Detect missing if blocks

ba7039c

When unnecessarily using a fat arrow after an if condition, suggest the removal of it. When finding an if statement with no block, point at the `if` keyword to provide more context.

Add label to primary span in some parse errors

36baa81

Diagnostic tweaks (review)

d63d363

fix rebase

24be75d

impl Clone for ::std_unicode::char::{ToLowercase, ToUppercase}

5ac4f62

Restore the download of rust-mingw

39d0b05

The build might otherwise break due to mixing MinGW object files from rust-std and the local MinGW which might be newer/older than the version used to build rust-std. Fixes rust-lang#48272

Document why we download rust-mingw

5332d9a

Rollup merge of rust-lang#48338 - estebank:match-missing-comma, r=pet…

9d2f1e5

…rochenkov Fixes rust-lang#47311. r? @nrc

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 2, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 2, 2018

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2018

Manishearth force-pushed the rollup branch from ac275ee to 34f683f Compare March 2, 2018 09:36

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 2, 2018

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 2, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 2, 2018

alexcrichton and others added 6 commits March 2, 2018 07:05

Rollup merge of rust-lang#48637 - segevfiner:restore-rust-mingw-downl…

c54f204

…oad, r=alexcrichton Fixes rust-lang#47311. r? @nrc

Rollup merge of rust-lang#48466 - sanxiyn:no-neon, r=alexcrichton

a6f6f2e

Fixes rust-lang#47311. r? @nrc

Rollup merge of rust-lang#48569 - Phlosioneer:x-py-help-optimization,…

03f32b9

… r=petrochenkov Fixes rust-lang#47311. r? @nrc

Rollup merge of rust-lang#48629 - strake:char, r=alexcrichton

a000d41

Fixes rust-lang#47311. r? @nrc

Rollup merge of rust-lang#48513 - alexcrichton:simd, r=JoshTriplett

a62c9d5

Fixes rust-lang#47311. r? @nrc

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2018

Manishearth force-pushed the rollup branch from 2f37740 to c5d2fd2 Compare March 2, 2018 15:51

Manishearth closed this Mar 2, 2018

Manishearth reopened this Mar 2, 2018

Rollup merge of rust-lang#48641 - alexcrichton:no-hash-l-paths, r=mic…

bc90898

…haelwoerister Fixes rust-lang#47311. r? @nrc

Manishearth force-pushed the rollup branch from c5d2fd2 to bc90898 Compare March 2, 2018 17:53

Manishearth closed this Mar 2, 2018

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

Uh oh!

Conversation

Manishearth commented Mar 2, 2018

Uh oh!

Manishearth commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

kennytm commented Mar 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Manishearth commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

Manishearth commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

kennytm commented Mar 2, 2018

Uh oh!

Manishearth commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

Manishearth commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

Manishearth commented Mar 2, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

kennytm commented Mar 2, 2018 •

edited

Loading