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 5 pull requests #87003

Merged
merged 10 commits into from
Jul 9, 2021
Merged

Rollup of 5 pull requests #87003

merged 10 commits into from
Jul 9, 2021

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Jul 9, 2021

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

LeSeulArtichaut and others added 10 commits July 4, 2021 03:34
to simplify the implementation and avoid unnecessary
conversions from `Option<usize>` to `isize` and back.
I'd updated the ones inside the method, but not its doc comment.
It was already used for the message. This also uses it for the spans
used for the error and backtrace.
Inline implementation of lookup_line

to avoid unnecessary conversions from `Option<usize>` to `isize` and back.
…, r=nagisa

Change linked tracking issue for more_qualified_paths

This updates the linked tracking issue for the `more_qualified_paths` feature from the implementation PR rust-lang#80080 to an actual tracking issue rust-lang#86935.
…trochenkov

Update the comment on `lower_expr_try`

I'd updated the ones inside the method, but not its doc comment.
…=oli-obk

Use #[track_caller] in const panic diagnostics.

This change stops const panic diagnostics from reporting inside #[track_caller] functions by skipping over them.
@rustbot rustbot added the rollup A PR which is a rollup label Jul 9, 2021
@m-ou-se
Copy link
Member Author

m-ou-se commented Jul 9, 2021

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jul 9, 2021

📌 Commit 2152c14 has been approved by m-ou-se

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

bors commented Jul 9, 2021

⌛ Testing commit 2152c14 with merge 619c27a...

@bors
Copy link
Contributor

bors commented Jul 9, 2021

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing 619c27a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 9, 2021
@bors bors merged commit 619c27a into rust-lang:master Jul 9, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 9, 2021
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.

7 participants