Skip to content

Rollup of 11 pull requests - #85014

Merged
bors merged 37 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-jzpbkdu
May 7, 2021
Merged

Rollup of 11 pull requests#85014
bors merged 37 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-jzpbkdu

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Mohsen Zohrevandiand others added 30 commits April 21, 2021 14:45
std::sync::mpsc uses thread locals and depending on the order TLS dtors
are run `rx.recv()` can panic when used in a TLS dtor.
This controls whether run-* tests actually get run.
I was wary of doing any automatic disabling here, since should-fail
is how we test compiletest itself.
I came up with this idea ages ago, but rustdoc used to ICE on it. Now it
doesn't.
The comment says that build dependencies shouldn't matter unless they do
some kind of codegen. It is safer to always check it though.
using allow_internal_unstable (as recommended)
Fixes: rust-lang#84836
```shell
$ ./build/x86_64-unknown-linux-gnu/stage1/bin/rustc src/test/run-make-fulldeps/coverage/no_cov_crate.rs
error[E0554]: `#![feature]` may not be used on the dev release channel
--> src/test/run-make-fulldeps/coverage/no_cov_crate.rs:2:1
|
2 | #![feature(no_coverage)]
| ^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
For more information about this error, try `rustc --explain E0554`.
```
I just need this until rustbuild supports -Cpanic=abort std directly.
This is a regression test for rust-lang#82820.
This test case is included in more general tests, but I think the error
regressed because there were a bunch of other diagnostic changes in the
test that obscured this regression.
Hopefully, having a test specific to the suggestion, and running rustfix
for the test, will prevent this error from regressing in the future.
…r=jethrogb
Ensure TLS destructors run before thread joins in SGX
The excellent test is from ```@jethrogb```
For context see: rust-lang#83416 (comment)
…k-Simulacrum
Add --run flag to compiletest
This controls whether run-* tests actually get run.
r? ```@Mark-Simulacrum```
…rk-Simulacrum
Add test for suggestion to borrow unsized function parameters
Closesrust-lang#82820.
This is a regression test for rust-lang#82820.
This test case is included in more general tests, but I think the error
regressed because there were a bunch of other diagnostic changes in the
test that obscured this regression.
Hopefully, having a test specific to the suggestion, and running rustfix
for the test, will prevent this error from regressing in the future.
…=Mark-Simulacrum
Add `needs-unwind` and beginning of support for testing `panic=abort` std to compiletest
For the Fuchsia platform we build libstd with `panic=abort` and would like a way to run tests with that enabled. This adds low-level support for this directly to compiletest.
In the future I'd like to add high-level support in rustbuild, e.g. having target-specific flags that allow configuring a panic strategy. (Side note: It would be nice if we could also build multiple configurations for the same target, but I'm getting ahead of myself.)
This plus rust-lang#84500 have everything that's needed to get ui tests passing on fuchsia targets.
Part of rust-lang#84766. Note that this change only includes the header on tests which need an unwinder to _build_, not those which need it to _run_.
r? ````@Mark-Simulacrum````
Allow using `core::` in intra-doc links within core itself
I came up with this idea ages ago, but rustdoc used to ICE on it. Now it doesn't.
Helps with rust-lang#73445. Doesn't fix it completely since `extern crate self as std;` in std still gives strange errors.
…, r=nagisa
Disallows `#![feature(no_coverage)]` on stable and beta (using standard crate-level gating)
Fixes: rust-lang#84836
Removes the function-level feature gating solution originally implemented, and solves the same problem using `allow_internal_unstable`, so normal crate-level feature gating mechanism can still be used (which disallows the feature on stable and beta).
I tested this, building the compiler with and without `CFG_DISABLE_UNSTABLE_FEATURES=1`
With unstable features disabled, I get the expected result as shown here:
```shell
$ ./build/x86_64-unknown-linux-gnu/stage1/bin/rustc src/test/run-make-fulldeps/coverage/no_cov_crate.rs
error[E0554]: `#![feature]` may not be used on the dev release channel
--> src/test/run-make-fulldeps/coverage/no_cov_crate.rs:2:1
|
2 | #![feature(no_coverage)]
| ^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
For more information about this error, try `rustc --explain E0554`.
```
r? ````@Mark-Simulacrum````
cc: ````@tmandry```` ````@wesleywiser````
Wire up tidy dependency checks for cg_clif
Also contains a fix and improvement to tidy.
Required for rust-lang#81746.
Handle incorrect placement of parentheses in trait bounds more gracefully
Fixrust-lang#84772.
CC ``````@jonhoo``````
CTFE engine: rename copy → copy_intrinsic, move to intrinsics.rs
The `copy` name is confusing for this function because we also have `copy_op` which is pretty different. I hope `copy_intrinsic` is clearer. Also `step.rs` should really just contain the main loop and opcode dispatch, so move this helper function to a more appropriate place.
r? ``````@oli-obk``````
…_default_session_globals, r=jyn514
Remove unneeded call to with_default_session_globals in rustdoc highlight
This was the origin of the `Span` bug in rust-lang#84176.
cc `````@Aaron1011`````
r? `````@jyn514`````
@rustbotrustbot added the rollup A PR which is a rollup label May 6, 2021
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented May 6, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 01e9d09 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 6, 2021
@bors

bors commented May 7, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 01e9d09 with merge 1773f14...

@bors

bors commented May 7, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 1773f14 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 7, 2021
@bors
bors merged commit 1773f14 into rust-lang:masterMay 7, 2021
@rustbotrustbot added this to the 1.54.0 milestone May 7, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

12 participants

@Dylan-DPC-zz@bors@rustbot@tmandry@jyn514@bjorn3@estebank@RalfJung@GuillaumeGomez@lcnr@camelid@Dylan-DPC