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 5 pull requests #64816

Merged
merged 23 commits into from
Sep 27, 2019
Merged

Rollup of 5 pull requests #64816

merged 23 commits into from
Sep 27, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 26, 2019

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrum and others added 23 commits September 25, 2019 16:57
This can be kept within the codegen backend crates entirely
Fuchsia exit codes don't follow the convention of libc::WEXITSTATUS et
al, and they are 64 bits instead of 32 bits. This gives Fuchsia its own
representation of ExitStatus.

Additionally, the zircon syscall structs were out of date, causing us to
see bogus return codes.
Based on issue rust-lang#64732, when creating a byte literal with single quotes,
the suggestion message would indicate that you meant to write a `str` literal,
but we actually meant to write a byte string literal.

So I changed the unescape_error_reporting.rs to decide whether to print out
"if you meant to write a `str` literal, use double quotes",
or "if you meant to write a byte string literal, use double quotes".
…hewjasper

 Rust 2015: No longer downgrade NLL errors

As per decision on a language team meeting as described in rust-lang#63565 (comment), in Rust 2015, we refuse to downgrade NLL errors, that AST borrowck accepts, into warnings and keep them as hard errors.

The remaining work to throw out AST borrowck and adjust some tests still remains after this PR.

Fixes rust-lang#38899
Fixes rust-lang#53432
Fixes rust-lang#45157
Fixes rust-lang#31567
Fixes rust-lang#27868
Fixes rust-lang#47366

r? @matthewjasper
Remove tx_to_llvm_workers from TyCtxt

This can be kept within the codegen backend crates entirely -- there's no reason for us to create it outside and attempt to hold it in the (global) context.

Changes here aren't really too easily reviewable I suspect -- not sure if they can be cleaned up by splitting into more commits though, it's just hard to reason about `Box<Any>` in general. If there are thoughts though I'd be happy to hear them.

The primary goal of this PR is to get rid of the field on `rustc_interface::Queries`.
Fix issue rust-lang#64732

Based on issue rust-lang#64732, when creating a byte literal with single quotes,
the suggestion message would indicate that you meant to write a `str` literal,
but we actually meant to write a byte string literal.

So I changed the unescape_error_reporting.rs to decide whether to print out
"if you meant to write a `str` literal, use double quotes",
or "if you meant to write a byte string literal, use double quotes".

Fixes rust-lang#64732.
Fix ExitStatus on Fuchsia

Fuchsia exit codes don't follow the convention of libc::WEXITSTATUS et
al, and they are 64 bits instead of 32 bits. This gives Fuchsia its own
representation of ExitStatus.

Additionally, the zircon syscall structs were out of date, causing us to
see bogus exit codes.

r? @cramertj @alexcrichton
@Centril
Copy link
Contributor Author

Centril commented Sep 26, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Sep 26, 2019

📌 Commit 02a8505 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 Sep 26, 2019
@bors
Copy link
Contributor

bors commented Sep 26, 2019

⌛ Testing commit 02a8505 with merge 24dbfe0...

bors added a commit that referenced this pull request Sep 26, 2019
Rollup of 5 pull requests

Successful merges:

 - #64221 ( Rust 2015: No longer downgrade NLL errors)
 - #64772 (Remove tx_to_llvm_workers from TyCtxt)
 - #64783 (Fix issue #64732)
 - #64787 (Fix ExitStatus on Fuchsia)
 - #64812 (Add test for E0543)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 26, 2019

💥 Test timed out

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 26, 2019
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 26, 2019
@Centril
Copy link
Contributor Author

Centril commented Sep 26, 2019

@bors retry

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 26, 2019
@bors
Copy link
Contributor

bors commented Sep 26, 2019

⌛ Testing commit 02a8505 with merge 0b1521f...

bors added a commit that referenced this pull request Sep 26, 2019
Rollup of 5 pull requests

Successful merges:

 - #64221 ( Rust 2015: No longer downgrade NLL errors)
 - #64772 (Remove tx_to_llvm_workers from TyCtxt)
 - #64783 (Fix issue #64732)
 - #64787 (Fix ExitStatus on Fuchsia)
 - #64812 (Add test for E0543)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 27, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 0b1521f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 27, 2019
@bors bors merged commit 02a8505 into rust-lang:master Sep 27, 2019
@Centril Centril deleted the rollup-gbeqot4 branch September 27, 2019 00:17
@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.

None yet

6 participants