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 9 pull requests #88750

Merged
merged 33 commits into from
Sep 8, 2021
Merged

Rollup of 9 pull requests #88750

merged 33 commits into from
Sep 8, 2021

Conversation

jackh726
Copy link
Member

@jackh726 jackh726 commented Sep 8, 2021

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fee1-dead and others added 30 commits August 31, 2021 05:24
This implementation has no `Copy` or `Clone` bound, so its operation is
guaranteed to be a move. The call site might copy, but the function
itself cannot.

Also linkify `Some` while we're touching the line anyway.
…r=camelid

Rustdoc: Report Layout of enum variants

Followup of rust-lang#83501, Fixes rust-lang#86253.

cc `@camelid`

`@rustbot` label A-rustdoc
… r=Mark-Simulacrum

Add regression test for rust-lang#74400

Closes rust-lang#74400 by adding a regression test.
Improve diagnostics for unary plus operators (rust-lang#88276)

This pull request improves the diagnostics emitted on parsing a unary plus operator. See rust-lang#88276.

Before:

```
error: expected expression, found `+`
 --> src/main.rs:2:13
  |
2 |     let x = +1;
  |             ^ expected expression
```

After:

```
error: leading `+` is not supported
 --> main.rs:2:13
  |
2 |     let x = +1;
  |             ^
  |             |
  |             unexpected `+`
  |             help: try removing the `+`
```
… r=joshtriplett

More symbolic doc aliases

A bunch of small changes, mostly adding `#[doc(alias = "…")]` entries for symbolic `"…"`.

Also a small change in documentation of `const` keywords.
Correct “copies” to “moves” in `<Option<T> as From<T>>::from` doc, and other copyediting

The `impl<T> From<T> for Option<T>` has no `Copy` or `Clone` bound, so its operation is guaranteed to be a move. The call site might copy, but the function itself cannot.

Since that would have been a rather small PR, I also reviewed the other documentation in the file and made other improvements (in separate commits): adding periods and commas, linking `Deref::Target`, and clarifying what "a container" is in `FromIterator`.
Add a regression test for rust-lang#88649

I noticed that rust-lang#88649 does not have a regression test, so I add one in this PR.

The test fails with this without rust-lang#88678:
```
error[E0080]: evaluation of constant value failed
  --> /checkout/src/test/ui/consts/issue-88649.rs:13:52
   |
LL |             Foo::Variant1(x) | Foo::Variant2(x) if x => {}
   |                                                    ^ StorageLive on a local that was already live

error: aborting due to previous error

For more information about this error, try `rustc --explain E0080`.
```
…mulacrum

Drop 1.56 stabilizations from 1.55 release notes

r? `@Mark-Simulacrum`
…shtriplett

Fix docs for `uX::checked_next_multiple_of`

Thanks to `@photino` for noticing this [here](rust-lang#88581 (comment)).

r? `@joshtriplett`

`@rustbot` label: +A-docs +A-waiting-on-review
Fix typo in `const_generics` replaced with `adt_const_params` note
@rustbot rustbot added the rollup A PR which is a rollup label Sep 8, 2021
@jackh726
Copy link
Member Author

jackh726 commented Sep 8, 2021

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Sep 8, 2021

📌 Commit 4cb751e has been approved by jackh726

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

bors commented Sep 8, 2021

⌛ Testing commit 4cb751e with merge 47ae8de...

@bors
Copy link
Contributor

bors commented Sep 8, 2021

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 47ae8de to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2021
@bors bors merged commit 47ae8de into rust-lang:master Sep 8, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 8, 2021
@jackh726 jackh726 deleted the rollup-w57i9fp branch September 8, 2021 20:44
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (47ae8de): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

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.