Skip to content

Conversation

SkiFire13
Copy link
Contributor

This should fix invalid suggestions that didn't account for empty bracket pairs (<>) or type bindings.

@SkiFire13 SkiFire13 force-pushed the fix-diag branch 2 times, most recently from 776cc42 to 3a7c076 Compare April 2, 2021 07:34
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@the8472
Copy link
Member

the8472 commented Apr 2, 2021

@Dylan-DPC this is missing an assignee

@Dylan-DPC-zz
Copy link

r? @estebank

@crlf0710 crlf0710 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2021
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 9, 2021
@bors
Copy link
Collaborator

bors commented May 10, 2021

☔ The latest upstream changes (presumably #85150) made this pull request unmergeable. Please resolve the merge conflicts.

@SkiFire13 SkiFire13 force-pushed the fix-diag branch 2 times, most recently from 105f916 to c1c6d8f Compare May 10, 2021 19:40
@bors
Copy link
Collaborator

bors commented May 11, 2021

☔ The latest upstream changes (presumably #82272) made this pull request unmergeable. Please resolve the merge conflicts.

@estebank
Copy link
Contributor

@SkiFire13 apologies for the delay and the significant divergence introduced by #82272. That PR touches a lot of code that affects the same output you were trying to improve. Would you be interested in trying to port your changes to the new approach?

@SkiFire13
Copy link
Contributor Author

Don't worry, I feel like if my PR would have been merged before it would have been harder to rebase #82272. I'm currently working on rebasing it.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 12, 2021

📌 Commit 7f5ad61 has been approved by estebank

@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 May 12, 2021
@bors
Copy link
Collaborator

bors commented May 13, 2021

⌛ Testing commit 7f5ad61 with merge 631e989...

@bors
Copy link
Collaborator

bors commented May 13, 2021

☀️ Test successful - checks-actions
Approved by: estebank
Pushing 631e989 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 13, 2021
@bors bors merged commit 631e989 into rust-lang:master May 13, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 13, 2021
@SkiFire13 SkiFire13 deleted the fix-diag branch May 13, 2021 08:31
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 20, 2021
Fix missing lifetimes diagnostics after rust-lang#83759

In rust-lang#83759 while rebasing I didn't realize there was a new function for suggesting to add lifetime arguments. It relied on some invariants, namely that if a generic type/trait has angle brackets then it must have some generic argument, which is now no longer true. This PR updates that function to handle the new invariants.

This also adds a new regression test but I'm not sure if that's the correct place for it.

Fixes rust-lang#85347
bors added a commit to rust-lang-ci/rust that referenced this pull request May 20, 2021
…laumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#85275 (Move `std::memchr` to `sys_common`)
 - rust-lang#85326 (bootstrap: ensure host std when cross-compiling tools, fixes rust-lang#85320)
 - rust-lang#85375 (Fix missing lifetimes diagnostics after rust-lang#83759)
 - rust-lang#85507 (Extend escape key check)
 - rust-lang#85509 (Prevent tab title to "null" if the URL is a search one)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
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. 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