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 of 18 pull requests #59370

Merged
merged 66 commits into from
Mar 23, 2019
Merged

Rollup of 18 pull requests #59370

merged 66 commits into from
Mar 23, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 22, 2019

Successful merges:

Failed merges:

r? @ghost

varkor and others added 30 commits March 14, 2019 01:02
When failing to parse struct-like enum variants, the ADT gets recorded
as having no fields. Record that we have actually recovered during
parsing of this variant to avoid complaing about non-existing fields
when actually using it.
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Centril added 16 commits March 22, 2019 19:31
…r=steveklabnik

Update and clean up several parts of CONTRIBUTING.md
consistent naming for Rhs type parameter in libcore/ops

Rename RHS type parameter occurrences RHS->Rhs to make it consistent throughout files and follow naming conventions.
Rename miri component to miri-preview

It should fix installation via `rustup` and indicates it's not stable yet.
…etrochenkov

Do not complain about non-existing fields after parse recovery

When failing to parse struct-like enum variants, the ADT gets recorded
as having no fields. Record that we have actually recovered during
parsing of this variant to avoid complaing about non-existing fields
when actually using it.

Fix rust-lang#57361.
…xcrichton

Make Option<ThreadId> no larger than ThreadId, with NonZeroU64
…estebank

convert field/method confusion help to suggestions
Move some bench tests back from libtest

It doesn't make much sense to test these on rust-lang/libtest since they exercise the `#[bench]` macro which is part of rust-lang/rust.

This PR moves these tests back here.

r? @alexcrichton
…chton

Add messages for different verbosity levels. Output copy actions.
…avidtwco

Unify E0109, E0110 and E0111

Error messages should no longer be restricted to specific generic kinds.
Tweak incorrect escaped char diagnostic
…arkor

use suggestions for "enum instead of variant" error
Add NAN test to docs

Documents and tests NAN behavior for the new (f32, f64)::clamp function.
cleanup: Remove compile-fail-fulldeps directory again

It was already removed once in rust-lang#56444, but was partially resurrected by rebase of some other PR.
Move one test from run-make-fulldeps to ui

The test was written when `--extern` without path didn't exist.
Add tracking issue number for `seek_convenience`

We forgot to do that in rust-lang#58422
@Centril
Copy link
Contributor Author

Centril commented Mar 22, 2019

@bors r+ p=18

@bors
Copy link
Contributor

bors commented Mar 22, 2019

📌 Commit cf8c739 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 22, 2019
@bors
Copy link
Contributor

bors commented Mar 22, 2019

⌛ Testing commit cf8c739 with merge 9f91bee...

bors added a commit that referenced this pull request Mar 22, 2019
Rollup of 18 pull requests

Successful merges:

 - #59106 (Add peer_addr function to UdpSocket)
 - #59170 (Add const generics to rustdoc)
 - #59172 (Update and clean up several parts of CONTRIBUTING.md)
 - #59190 (consistent naming for Rhs type parameter in libcore/ops)
 - #59236 (Rename miri component to miri-preview)
 - #59266 (Do not complain about non-existing fields after parse recovery)
 - #59273 (some small HIR doc improvements)
 - #59291 (Make Option<ThreadId> no larger than ThreadId, with NonZeroU64)
 - #59297 (convert field/method confusion help to suggestions)
 - #59304 (Move some bench tests back from libtest)
 - #59309 (Add messages for different verbosity levels. Output copy actions.)
 - #59321 (Unify E0109, E0110 and E0111)
 - #59322 (Tweak incorrect escaped char diagnostic)
 - #59323 (use suggestions for "enum instead of variant" error)
 - #59327 (Add NAN test to docs)
 - #59329 (cleanup: Remove compile-fail-fulldeps directory again)
 - #59347 (Move one test from run-make-fulldeps to ui)
 - #59360 (Add tracking issue number for `seek_convenience`)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Mar 23, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 9f91bee to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2019
@bors bors merged commit cf8c739 into rust-lang:master Mar 23, 2019
@bors bors mentioned this pull request Mar 23, 2019
@Centril Centril deleted the rollup branch March 23, 2019 00:38
@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
merged-by-bors This PR was explicitly merged by bors. 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.