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 11 pull requests #86127

Merged
merged 27 commits into from
Jun 8, 2021
Merged

Rollup of 11 pull requests #86127

merged 27 commits into from
Jun 8, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

LingMan and others added 27 commits June 1, 2021 20:50
These are tracked in src/tools/rustfmt/.gitattributes already, they
don't need to be listed twice.
Prior to this patch, the default panic message (resulting from calling
`panic_any(42);` for example), would print the following error message:

```
thread 'main' panicked at 'Box<Any>', ...
```

However, this should be `Box<dyn Any>` instead.
This patch fixes tests from failing that were matching on `Box<Any>`,
which was the old panic message. Since the new panic message is `Box<dyn
Any>`, the tests have been updated to match against this instead.
Use `Iterator::find` instead of open-coding it

```@rustbot``` modify labels +C-cleanup +T-compiler
…eklabnik

Update the documentation of `-C force-unwind-tables` for rust-lang#83482

`panic=unwind` does not require `force-unwind-tables` to be "yes" anymore.
I forgot to update this in rust-lang#83482.
Clarify documentation of slice sorting methods

After reading about [this](https://polkadot.network/a-polkadot-postmortem-24-05-2021/), I realized that although the documentation of these methods is not ambiguous in its current state, it is very easy to read it and erroneously assume that their exact behaviour can be relied upon to be deterministic. Although the docs make no guarantees about which index is returned when there are multiple matches, being more explicit about when and how their determinism can be relied upon should help prevent people from making this mistake in the future.

r? ``@steveklabnik``
Remove rustfmt tests from top-level .gitattributes

These are tracked in src/tools/rustfmt/.gitattributes already, they
don't need to be listed twice.

r? `@ehuss` since you suggested adding them in rust-lang#82208; I think it should be ok now that bors isn't trying to merge the `subtree add` changes.

cc `@calebcartwright`
Default panic message should print Box<dyn Any>

Closes rust-lang#86039

Prior to this patch, the panic message from running the following code would be `thread 'main' panicked at 'Box<Any>'...`
```rust
use std::panic::panic_any;
fn main() {
    panic_any(42);
}
```

This patch updates the phrasing to be more consistent. It now instead shows the following panic message:

```
thread 'main' panicked at 'Box<dyn Any>', ...
```

It's a very small fix 😄
…t, r=jsha

Type page font weight

Fixes rust-lang#86069.

r? ```@jsha```
…odeblock, r=jsha

Search description codeblock

The codeblocks are not displayed correctly:

![Screenshot from 2021-06-07 11-11-53](https://user-images.githubusercontent.com/3050060/120991915-5fb05680-c782-11eb-9b32-973a64b1f631.png)

This PR interprets the HTML correctly (and still prevent invalid HTML because of how it inserts it):

![Screenshot from 2021-06-07 11-12-00](https://user-images.githubusercontent.com/3050060/120991919-6048ed00-c782-11eb-8ac5-c3aa6508bc8b.png)

r? ```@jsha```
Comment out unused error codes and add description for E0316

I have added an extended description of `E0316` and commented out a bunch of unused error codes to make clear the fact that they are no longer in use. You can check for yourself with
```shell
for ec in                                                \
    E0314 E0315   E0473 E0474 E0475   E0479 E0480 E0481  \
    E0483 E0484 E0485 E0486 E0487 E0488 E0489
do
    if [ ! -z "`grep -r $ec compiler/* --exclude-dir=rustc_error_codes`" ]
    then
        echo $ec
        false
    fi
done
```
i.e. these error codes appear nowhere in the compiler code and thus cannot be emitted.

r? ```@GuillaumeGomez```
…r=m-ou-se

Correct type signature in doc for Bound::as_mut

Thanks to ``@drmason13`` for pointing this out!
Remove lifetime hack

It compiles without the hack. But I don't know why. I can't get the example in the referenced issue to compile...
@rustbot rustbot added the rollup A PR which is a rollup label Jun 8, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=11 rollup=never

@bors
Copy link
Contributor

bors commented Jun 8, 2021

📌 Commit b7fadfd has been approved by JohnTitor

@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 Jun 8, 2021
@bors
Copy link
Contributor

bors commented Jun 8, 2021

⌛ Testing commit b7fadfd with merge a50d721...

@bors
Copy link
Contributor

bors commented Jun 8, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing a50d721 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2021
@bors bors merged commit a50d721 into rust-lang:master Jun 8, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 8, 2021
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #86127!

Tested on commit a50d721.
Direct link to PR: #86127

💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 8, 2021
Tested on commit rust-lang/rust@a50d721.
Direct link to PR: <rust-lang/rust#86127>

💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
@JohnTitor JohnTitor deleted the rollup-0c6mp3j branch June 8, 2021 12:37
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.