Skip to content

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Oct 29, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 30 commits October 24, 2019 22:52
Passes LLVM codegen and Emscripten link-time flags for exception
handling if and only if the panic strategy is `unwind`. Sets the
default panic strategy for Emscripten targets to `unwind`. Re-enables
tests that depend on unwinding support for Emscripten, including
`should_panic` tests.
As rustbook now depends transitively on openssl, it needs access to the
rustc-workspace-hack/all-static feature to pick up openssl-sys/vendored.
This fixes the rust build with `all-static = true` on systems where
openssl is not installed (e.g. when cross-compiling).
We have a job in our CI (PR's x86_64-gnu-tools) that's supposed to run
only when a submodule is changed in the PR, and it works by having a
task at the start of the build that skips all the following tasks if the
condition isn't met.

Before this commit that task was gated with template parameters, which
is a unique feature of Azure Pipelines. To make our CI more generic this
commit switches the gate to use a simple environment variable plus a
condition, which should be supported on more CI providers.
Co-Authored-By: lzutao <taolzu@gmail.com>
…-E0740, r=Dylan-DPC

Create new error E0742 and add long error explanation

Part of rust-lang#61137.

Creates E0742 error code and add its long error explanation.
resolve: Turn the "non-empty glob must import something" error into a lint

This fixes rust-lang#62334 by changing the error to a lint warning the glob. I changed the test but I'm very unsure of what I did as I do not know how to correctly check for the warning
…ameter, r=alexcrichton

ci: refactor pr tools job skipping

We have a job in our CI (PR's x86_64-gnu-tools) that's supposed to run only when a submodule is changed in the PR, and it works by having a task at the start of the build that skips all the following tasks if the condition isn't met.

Before this commit that task was gated with template parameters, which is a unique feature of Azure Pipelines. To make our CI more generic this commit switches the gate to use a simple environment variable plus a condition, which should be supported on more CI providers.

This PR also extracts the skipping logic into a script.

r? @alexcrichton
Prevent help popup to disappear when clicking on it

Fixes rust-lang#65736.

r? @kinnison
…ng, r=alexcrichton

Re-enable Emscripten's exception handling support

Passes LLVM codegen and Emscripten link-time flags for exception
handling if and only if the panic strategy is `unwind`. Sets the
default panic strategy for Emscripten targets to `unwind`. Re-enables
tests that depend on unwinding support for Emscripten, including
`should_panic` tests.

r? @alexcrichton
…r=alexcrichton

Enable dist for MIPS64 musl targets

Continuing work in rust-lang#63165, necessary libc changes are in place and published so here we go!
add basic HermitCore support within libtest

This an extension to rust-lang#65167. The current pull request extend libtest to support HermitCore as target OS.
…chton

proc_macro: clean up bridge::client::__run_expand{1,2} a bit.

See commit titles/diffs for more details.

The first commit is made possible by rust-lang#53451 being fixed (almost a year ago).
The last commit should remove the need for `#[allow(improper_ctypes)]` in rust-lang#65134.
…richton

Update mdbook to 0.3.3

There are some new features of mdbook that I'd like to use in TRPL.
…crichton

Use rustc-workspace-hack for rustbook

As rustbook now depends transitively on openssl, it needs access to the
rustc-workspace-hack/all-static feature to pick up openssl-sys/vendored.
This fixes the rust build with `all-static = true` on systems where
openssl is not installed (e.g. when cross-compiling).
…tolnay

doc: use new feature gate for c_void type

Closes rust-lang#63694, closes rust-lang#55619
…matsakis

save-analysis: Account for async desugaring in async fn return types

Closes rust-lang#65590

When visiting the return type of an async function we need to take into account its desugaring, since it introduces a new definition under which the return type is redefined.

r? @nikomatsakis
@tmandry
Copy link
Member Author

tmandry commented Oct 29, 2019

@bors r+ p=12 rollup=never

@bors
Copy link
Collaborator

bors commented Oct 29, 2019

📌 Commit db49686 has been approved by tmandry

@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 Oct 29, 2019
@bors
Copy link
Collaborator

bors commented Oct 29, 2019

⌛ Testing commit db49686 with merge aa69777...

bors added a commit that referenced this pull request Oct 29, 2019
Rollup of 12 pull requests

Successful merges:

 - #65405 (Create new error E0742 and add long error explanation)
 - #65539 (resolve: Turn the "non-empty glob must import something" error into a lint)
 - #65724 (ci: refactor pr tools job skipping)
 - #65741 (Prevent help popup to disappear when clicking on it)
 - #65832 (Re-enable Emscripten's exception handling support)
 - #65843 (Enable dist for MIPS64 musl targets)
 - #65898 (add basic HermitCore support within libtest)
 - #65900 (proc_macro: clean up bridge::client::__run_expand{1,2} a bit.)
 - #65906 (Update mdbook to 0.3.3)
 - #65920 (Use rustc-workspace-hack for rustbook)
 - #65930 (doc: use new feature gate for c_void type)
 - #65936 (save-analysis: Account for async desugaring in async fn return types)

Failed merges:

 - #65434 (Add long error explanation for E0577)

r? @ghost
@bors
Copy link
Collaborator

bors commented Oct 29, 2019

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing aa69777 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 29, 2019
@bors bors merged commit db49686 into rust-lang:master Oct 29, 2019
@tmandry tmandry deleted the rollup-g20uvkh branch October 30, 2019 01:01
@tmandry tmandry added the rollup A PR which is a rollup label Oct 30, 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.