Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup (unsupervised) #48689

Merged
merged 25 commits into from
Mar 3, 2018
Merged

Rollup (unsupervised) #48689

merged 25 commits into from
Mar 3, 2018

Conversation

Manishearth
Copy link
Member

@Manishearth Manishearth commented Mar 3, 2018

less risky PRs, to run overnight

frewsxcv and others added 25 commits February 24, 2018 08:56
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.
Makes the bench asked about on URLO 58x faster :)
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
@Manishearth
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Mar 3, 2018

📌 Commit 40d2a98 has been approved by Manishearth

@bors 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 3, 2018
@bors
Copy link
Contributor

bors commented Mar 3, 2018

⌛ Testing commit 40d2a98 with merge c9b86a9...

bors added a commit that referenced this pull request Mar 3, 2018
Rollup (unsupervised)

less risky PRs, to run overnight
@bors
Copy link
Contributor

bors commented Mar 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Manishearth
Pushing c9b86a9 to master...

@bors bors merged commit 40d2a98 into rust-lang:master Mar 3, 2018
@Manishearth Manishearth deleted the rollup branch March 3, 2018 17:40
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: 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.

9 participants