Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Rollup of 5 pull requests #84644

Merged
merged 12 commits into from
Apr 28, 2021
Merged

Rollup of 5 pull requests #84644

merged 12 commits into from
Apr 28, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

richkadel and others added 12 commits April 24, 2021 17:27
Fixes: rust-lang#84180

For chained function calls separated by the `?` try operator, the
function call following the try operator produced a MIR `Call` span that
matched the span of the first call. The `?` try operator started a new
span, so the second call got no span.

It turns out the MIR `Call` terminator has a `func` `Operand`
for the `Constant` representing the function name, and the function
name's Span can be used to reset the starting position of the span.
Improve coverage spans for chained function calls

Fixes: rust-lang#84180

For chained function calls separated by the `?` try operator, the
function call following the try operator produced a MIR `Call` span that
matched the span of the first call. The `?` try operator started a new
span, so the second call got no span.

It turns out the MIR `Call` terminator has a `func` `Operand`
for the `Constant` representing the function name, and the function
name's Span can be used to reset the starting position of the span.

r? `@tmandry`
cc: `@wesleywiser`
…, r=jsha

Fix empty dom toggle

Currently, the empty impl blocks have toggles:

![Screenshot from 2021-04-27 15-15-03](https://user-images.githubusercontent.com/3050060/116249703-5ee0d980-a76d-11eb-9e15-738c06e4fb1b.png)

So when you expand it, nothing happens:

![Screenshot from 2021-04-27 15-15-07](https://user-images.githubusercontent.com/3050060/116249746-686a4180-a76d-11eb-8dc1-221ca0ac57c5.png)

So now, in case the impl block is empty, we simply don't generate the details/summary wrapping (which also makes DOM lighter, yeay!):

![Screenshot from 2021-04-27 15-14-15](https://user-images.githubusercontent.com/3050060/116249825-7a4be480-a76d-11eb-9637-b26151311ebd.png)

r? `@jsha`
…atsakis

Make traits with GATs not object safe

Closes rust-lang#81823

r? `@nikomatsakis`
Make sentence in env::args_os' docs plain and simple

Follow-up to rust-lang#84551. See rust-lang#84551 (comment) on why this makes more sense.
@rustbot rustbot added the rollup A PR which is a rollup label Apr 28, 2021
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 28, 2021

📌 Commit 7ebe5b9 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 Apr 28, 2021
@bors
Copy link
Contributor

bors commented Apr 28, 2021

⌛ Testing commit 7ebe5b9 with merge 0902c45006a65118007c32460a715e0593f13e17...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  1  424M    1 7227k    0     0  4343k      0  0:01:40  0:00:01  0:01:39 4343k
  3  424M    3 13.0M    0     0  5123k      0  0:01:24  0:00:02  0:01:22 5122k
  4  424M    4 18.9M    0     0  5421k      0  0:01:20  0:00:03  0:01:17 5421k
  5  424M    5 23.1M    0     0  5657k      0  0:01:16  0:00:04  0:01:12 5657k
curl: (56) OpenSSL SSL_read: Connection reset by peer, errno 54
clang+llvm-10.0.0-x86_64-apple-darwin/lib/libclang-cpp.dylib: Lzma library error:  No progress is possible
tar: Error exit delayed from previous errors.
##[error]Process completed with exit code 1.
[command]/usr/local/bin/git version
git version 2.31.1
[command]/usr/local/bin/git config --local --name-only --get-regexp core\.sshCommand
[command]/usr/local/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :

@JohnTitor
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Apr 28, 2021

⌛ Testing commit 7ebe5b9 with merge 76a04dd...

@bors
Copy link
Contributor

bors commented Apr 28, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 28, 2021
@bors bors merged commit 76a04dd into rust-lang:master Apr 28, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 28, 2021
@JohnTitor JohnTitor deleted the rollup-nzq9rjz branch April 28, 2021 10:52
# for free to join this conversation on GitHub. Already have an account? # 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.

9 participants