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.

Sign up for GitHub

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

Jump to bottom

Prevent lifetime elision in type alias #93542

Merged
merged 2 commits into from
Feb 2, 2022
Merged

Prevent lifetime elision in type alias #93542

merged 2 commits into from
Feb 2, 2022

Conversation

GuillaumeGomez
Copy link
Member

Fixes #93401.

Apparently, the problem has been fixed in the compiler.

r? @oli-obk

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-ui Area: rustdoc UI (generated HTML) labels Feb 1, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 1, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Feb 1, 2022

This is a revert of #91430

cc @jyn514 @jackh726

@oli-obk
Copy link
Contributor

oli-obk commented Feb 2, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 2, 2022

📌 Commit 2308464 has been approved by oli-obk

@bors bors 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 Feb 2, 2022
@jyn514
Copy link
Member

jyn514 commented Feb 2, 2022

This is a revert of #91430

cc @jyn514 @jackh726

Not really - the thing I cared about in that PR was the tests, which this keeps. I probably shouldn't have messed with the code itself.

@matthiaskrgr matthiaskrgr mentioned this pull request Feb 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2022
@bors
Auto merge of rust-lang#93594 - matthiaskrgr:rollup-lcvhpdv, r=matthi…
27f5d83 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#92528 (Make `Fingerprint::combine_commutative` associative)
 - rust-lang#93221 ([borrowck] Fix help on mutating &self in async fns)
 - rust-lang#93542 (Prevent lifetime elision in type alias)
 - rust-lang#93546 (Validate that values in switch int terminator are unique)
 - rust-lang#93571 (better suggestion for duplicated `where` clause)
 - rust-lang#93574 (don't suggest adding `let` due to bad assignment expressions inside of `while` loop)
 - rust-lang#93590 (More let_else adoptions)
 - rust-lang#93592 (Remove unused dep from rustc_arena)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7e212c1 into rust-lang:master Feb 2, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 2, 2022
@GuillaumeGomez GuillaumeGomez deleted the lifetime-elision branch February 2, 2022 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
A-rustdoc-ui Area: rustdoc UI (generated HTML) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.

rustdoc regression: Lifetime in type alias definition is incorrectly elided
6 participants
@GuillaumeGomez @oli-obk @bors @jyn514 @rust-highfive @rustbot