Skip to content

[beta] backports - #97014

Merged
bors merged 7 commits into
rust-lang:betafrom
Mark-Simulacrum:beta-next
May 14, 2022
Merged

[beta] backports#97014
bors merged 7 commits into
rust-lang:betafrom
Mark-Simulacrum:beta-next

Conversation

@Mark-Simulacrum

@Mark-SimulacrumMark-Simulacrum commented May 13, 2022•
edited
Loading

Copy link
Copy Markdown
Member

ChrisDentonand others added 5 commits May 13, 2022 10:02
@ChrisDenton@Mark-Simulacrum
Revert "Rollup merge ofrust-lang#92519- ChrisDenton:command-maybe-v…
2a5c4e9
…erbatim, r=dtolnay"
This reverts commit ba2d5ed, reversing
changes made to 9b701e7.
@ricked-twice@Mark-Simulacrum
Quick fix forrust-lang#96223.
5046d91
@ricked-twice@Mark-Simulacrum
Taking review hints into account.
6db7d1b
@flip1995@Mark-Simulacrum
Prevent infinite (exponential) recursion in only_used_in_recursion
096a7ca
This simplifies the visitor code a bit and prevents checking expressions
multiple times. I still think this lint should be removed for now,
because its code isn't really tested.
@flip1995@Mark-Simulacrum
Move only_used_in_recursion to nursery
7d3bb1d
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 13, 2022
@rust-highfive

rust-highfive commented May 13, 2022

Copy link
Copy Markdown
Contributor

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs to request review from a libs-api team reviewer. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive

rust-highfive commented May 13, 2022

Copy link
Copy Markdown
Contributor

r? @kennytm

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive

rust-highfive commented May 13, 2022

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 13, 2022
@Mark-SimulacrumMark-Simulacrum changed the title [beta][beta] backportsMay 13, 2022
@Mark-Simulacrum

Mark-Simulacrum commented May 13, 2022

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=1

@bors

bors commented May 13, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 7d3bb1d has been approved by Mark-Simulacrum

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 13, 2022
This was referenced May 13, 2022
Closed
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum

Mark-Simulacrum commented May 13, 2022

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=1

@bors

bors commented May 13, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 169374f has been approved by Mark-Simulacrum

@jackh726

jackh726 commented May 13, 2022

Copy link
Copy Markdown
Member

What about #96593 and #96970?

@jackh726

jackh726 commented May 13, 2022

Copy link
Copy Markdown
Member

I guess you're waiting for #96970 to land first, but #96593 has already landed.

@Mark-Simulacrum

Mark-Simulacrum commented May 13, 2022

Copy link
Copy Markdown
MemberAuthor

I'll roll them in. They're not appropriately tagged it looks like - prior to backport both nominated and accepted should be applied.

@Mark-Simulacrum

Mark-Simulacrum commented May 13, 2022

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=1

@bors

bors commented May 13, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 97f0d7f has been approved by Mark-Simulacrum

@ChrisDentonChrisDenton mentioned this pull request May 13, 2022
Merged
@bors

bors commented May 14, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 97f0d7f with merge eb1e588...

@bors

bors commented May 14, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing eb1e588 to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 14, 2022
@bors
bors merged commit eb1e588 into rust-lang:betaMay 14, 2022
@rustbotrustbot added this to the 1.61.0 milestone May 14, 2022
@Mark-Simulacrum
Mark-Simulacrum deleted the beta-next branch May 14, 2022 16:49
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

10 participants

@Mark-Simulacrum@rust-highfive@bors@rust-log-analyzer@jackh726@kennytm@rustbot@ChrisDenton@ricked-twice@flip1995