Skip to content
New issue

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

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

Already on GitHub? # to your account

Rollup of 5 pull requests #70483

Merged
merged 10 commits into from
Mar 28, 2020
Merged

Rollup of 5 pull requests #70483

merged 10 commits into from
Mar 28, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 27, 2020

Successful merges:

Failed merges:

r? @ghost

nnethercote and others added 10 commits March 27, 2020 11:59
Specifically, remove both `-Z no_integrated_as` and
`TargetOptions::no_integrated_as`. The latter was only used for the
`msp430_none_elf` platform, for which it's no longer required.
…alexcrichton

Remove `no_integrated_as` mode.

Specifically, remove both `-Z no_integrated_as` and
`TargetOptions::no_integrated_as`. The latter was only used for the
`msp430_none_elf` platform, for which it's no longer required.

r? @alexcrichton
suggest `;` on expr `mac!()` which is good as stmt `mac!()`

Fixes rust-lang#34421 by implementing @jseyfried's suggestion in rust-lang#34421 (comment).

r? @petrochenkov
…pe, r=estebank

non-exhastive diagnostic: add note re. scrutinee type

This fixes rust-lang#67259 by adding a note:
```
    = note: the matched value is of type &[i32]
```
to non-exhaustive pattern matching errors.

r? @varkor @estebank
Refactor type_of for constants

If I have to look at this function for a few hours I want it to at least look good.

r? @varkor
clarify hir_id <-> node_id method names

resolves 2 FIXME.

r? @eddyb
@Centril
Copy link
Contributor Author

Centril commented Mar 27, 2020

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Mar 27, 2020

📌 Commit a023e61 has been approved by Centril

@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 27, 2020
@bors
Copy link
Contributor

bors commented Mar 28, 2020

⌛ Testing commit a023e61 with merge 2acf32d...

@bors
Copy link
Contributor

bors commented Mar 28, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 2acf32d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 28, 2020
@bors bors merged commit 2acf32d into rust-lang:master Mar 28, 2020
@Centril Centril deleted the rollup-slli4yf branch March 28, 2020 03:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

4 participants